188111 2018-07-27 12:23:38 -0700 REGRESSION(r263094): [GTK][WPE] API test /webkit/WebKitWebContext/languages is failing 2021-03-02 15:24:29 -0800 1 1 1 Unclassified WebKit WebKitGTK Other PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=222619 P2 Normal --- 1 mcatanzaro webkit-unassigned berto bugs-noreply cdumez cgarcia ews-watchlist gustavo mcatanzaro pvollan oldest_to_newest 1445802 0 mcatanzaro 2018-07-27 12:23:38 -0700 API test /webkit/WebKitWebContext/languages always fails: /webkit/WebKitWebContext/languages: FAIL ERROR:/home/slave/webkitgtk/gtk-linux-64-release/build/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebContext.cpp:476:void testWebContextLanguages(WebViewTest*, gconstpointer): assertion failed: (!javascriptResult) 1721197 1 mcatanzaro 2021-01-21 09:26:27 -0800 Nowadays it fails even earlier: ERROR:../../Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebContext.cpp:359:void testWebContextLanguages(WebViewTest*, gconstpointer): assertion failed (mainResourceDataSize == strlen(expectedLanguages)): (5 == 25) Problem is the language is set to "en-US" rather than the expected "en,ES-es;q=0.90,dE;q=0.80". 1732813 2 cgarcia 2021-02-24 02:44:04 -0800 (In reply to Michael Catanzaro from comment #1) > Nowadays it fails even earlier: > > ERROR:../../Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebContext.cpp: > 359:void testWebContextLanguages(WebViewTest*, gconstpointer): assertion > failed (mainResourceDataSize == strlen(expectedLanguages)): (5 == 25) > > Problem is the language is set to "en-US" rather than the expected > "en,ES-es;q=0.90,dE;q=0.80". This one is fixed by bug #222347 1732817 3 421392 cgarcia 2021-02-24 03:09:34 -0800 Created attachment 421392 Patch 1732818 4 ews-watchlist 2021-02-24 03:10:37 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1732858 5 421392 mcatanzaro 2021-02-24 06:56:07 -0800 Comment on attachment 421392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421392&action=review I was a bit confused how we wound up with a bug from 2018 fixing a regression from 2020. I see you just repurposed this bug to fix the new problem. OK. > Source/WebKit/ChangeLog:9 > + are no loner sending the new overrides to the web process. Instead of calling overrideUserPreferredLanguages() no longer 1732859 6 mcatanzaro 2021-02-24 06:56:25 -0800 Hi Chris, could you review this one please? 1733229 7 cgarcia 2021-02-24 22:54:50 -0800 I didn't know this bug was so old. 1733330 8 421392 mcatanzaro 2021-02-25 08:09:02 -0800 Comment on attachment 421392 Patch Anyway it looks good to me, but requires owner approval (ideally from Chris). 1733340 9 421392 cdumez 2021-02-25 08:48:46 -0800 Comment on attachment 421392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421392&action=review > Source/WebKit/UIProcess/WebProcessPool.cpp:-308 > - addLanguageChangeObserver(this, languageChanged); I don't understand why we are getting rid of the language change observer in the UIProcess. Seems like we would want to know and notify the WebProcesses if the user changed the language, no? 1733678 10 cgarcia 2021-02-25 23:10:24 -0800 (In reply to Chris Dumez from comment #9) > Comment on attachment 421392 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=421392&action=review > > > Source/WebKit/UIProcess/WebProcessPool.cpp:-308 > > - addLanguageChangeObserver(this, languageChanged); > > I don't understand why we are getting rid of the language change observer in > the UIProcess. Seems like we would want to know and notify the WebProcesses > if the user changed the language, no? Because after this patch overrideUserPreferredLanguages() is no longer called from the UI process. Right now is only called from the GLib API, unless I'm missing something. 1734363 11 cgarcia 2021-03-01 03:12:44 -0800 Chris, are you ok with this then? 1734863 12 cdumez 2021-03-02 08:27:07 -0800 (In reply to Carlos Garcia Campos from comment #11) > Chris, are you ok with this then? I will look into this today. If this is not used on macOS then how do we detect and apply language change on macOS? macOS definitely has to do it in the UIProcess (and not WebProcess) due to sandboxing reasons). Seems like either macOS uses this or it doesn't and we may have a bug to fix (or there is another mechanism that macOS uses and that I am missing). 1734911 13 421392 cdumez 2021-03-02 10:16:23 -0800 Comment on attachment 421392 Patch LGTM. The WebProcess is able to listen to change notification on macOS. 1734918 14 ews-feeder 2021-03-02 10:25:43 -0800 Committed r273735: <https://commits.webkit.org/r273735> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421392. 421392 2021-02-24 03:09:34 -0800 2021-03-02 10:25:45 -0800 Patch wk2-language-overrides.diff text/plain 10937 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMjE3YjgxZjAxMjA3Li41NjY5N2FmN2VlNDYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjkgQEAKKzIwMjEtMDItMjQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjI2MzA5NCk6IFtHVEtdW1dQRV0gQVBJIHRl c3QgL3dlYmtpdC9XZWJLaXRXZWJDb250ZXh0L2xhbmd1YWdlcyBpcyBmYWlsaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODgxMTEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgR0xpYiBBUEkgYWxs b3dzIHRvIGNoYW5nZSB0aGUgdXNlciBwcmVmZXJyZWQgbGFuZ3VhZ2VzIGFmdGVyIHRoZSB3ZWIg cHJvY2VzcyBpcyBjcmVhdGVkLiBTaW5jZSByMjYzMDk0IHdlCisgICAgICAgIGFyZSBubyBsb25l ciBzZW5kaW5nIHRoZSBuZXcgb3ZlcnJpZGVzIHRvIHRoZSB3ZWIgcHJvY2Vzcy4gSW5zdGVhZCBv ZiBjYWxsaW5nIG92ZXJyaWRlVXNlclByZWZlcnJlZExhbmd1YWdlcygpCisgICAgICAgIHdlIG5v dyBzZXQgdGhlIG92ZXJyaWRlcyBpbiB0aGUgV2ViUHJvY2Vzc1Bvb2wgY29uZmlndXJhdGlvbiwg c28gdGhhdCB3ZSBjYW4gcmVtb3ZlIHRoZSBsYW5ndWFnZSBvYnNlcnZlci4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKHdlYmtp dF93ZWJfY29udGV4dF9zZXRfcHJlZmVycmVkX2xhbmd1YWdlcyk6IFVzZSBXZWJQcm9jZXNzUG9v bDo6c2V0T3ZlcnJpZGVMYW5ndWFnZXMoKSBpbnN0ZWFkIG9mCisgICAgICAgIG92ZXJyaWRlVXNl clByZWZlcnJlZExhbmd1YWdlcygpLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9v bC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpXZWJQcm9jZXNzUG9vbCkg UmVtb3ZlIHRoZSBsYW5ndWFnZSBvYnNlcnZlciByZWdpc3RyYXRpb24uCisgICAgICAgIChXZWJL aXQ6OldlYlByb2Nlc3NQb29sOjp+V2ViUHJvY2Vzc1Bvb2wpOiBSZW1vdmUgdGhlIGxhbmd1YWdl IG9ic2VydmVyIHVucmVnaXN0cmF0aW9uLgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9v bDo6c2V0T3ZlcnJpZGVMYW5ndWFnZXMpOiBVcGRhdGUgdGhlIGxhbmd1YWdlIG92ZXJyaWRlcyBp biB0aGUgY29uZmlndXJhdGlvbiBhbmQgbm90aWZ5CisgICAgICAgIGFsbCBwcm9jZXNzZXMuCisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpsYW5ndWFnZUNoYW5nZWQpOiBEZWxldGVk LgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnVzZXJQ cmVmZXJyZWRMYW5ndWFnZXNDaGFuZ2VkIGNvbnN0KTogQ2FsbCBvdmVycmlkZVVzZXJQcmVmZXJy ZWRMYW5ndWFnZXMoKSBhZ2FpbiBoZXJlLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vz cy5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbjoKKwogMjAy MS0wMi0yNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgUkVHUkVTU0lPTihyMjY3NzYzKTogW0dUS11bV1BFXSB1c2VyIHByZWZlcnJlZCBsYW5n dWFnZXMgYXJlIHNlbnQgdG8gdGhlIHdyb25nIG5ldHdvcmsgcHJvY2VzcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViQ29udGV4dC5jcHAgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcAppbmRl eCAyYmJlMWE3MjcyOGMuLjJhZTUyYmVjNTliNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTY1LDcgKzY1LDYg QEAKICNpbmNsdWRlIDx3dGYvRmlsZVN5c3RlbS5oPgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+ CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KLSNpbmNsdWRlIDx3dGYvTGFuZ3VhZ2UuaD4KICNp bmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5o PgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KQEAgLTE0NjMsNyArMTQ2Miw3IEBAIHZvaWQgd2Vi a2l0X3dlYl9jb250ZXh0X3NldF9wcmVmZXJyZWRfbGFuZ3VhZ2VzKFdlYktpdFdlYkNvbnRleHQq IGNvbnRleHQsIGNvbnN0CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGxhbmd1YWdlcy5hcHBl bmQoU3RyaW5nOjpmcm9tVVRGOChsYW5ndWFnZUxpc3RbaV0pLnJlcGxhY2UoIl8iLCAiLSIpKTsK ICAgICB9Ci0gICAgb3ZlcnJpZGVVc2VyUHJlZmVycmVkTGFuZ3VhZ2VzKGxhbmd1YWdlcyk7Cisg ICAgY29udGV4dC0+cHJpdi0+cHJvY2Vzc1Bvb2wtPnNldE92ZXJyaWRlTGFuZ3VhZ2VzKFdURk1v dmUobGFuZ3VhZ2VzKSk7CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Bvb2wuY3BwCmluZGV4IDQxMjBkMzdkNGMwNS4uNTQ0MjIwZWM5MmZhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC05Niw3ICs5Niw2IEBACiAj aW5jbHVkZSA8V2ViQ29yZS9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaD4KICNpbmNsdWRlIDxw YWwvU2Vzc2lvbklELmg+CiAjaW5jbHVkZSA8d3RmL0NhbGxiYWNrQWdncmVnYXRvci5oPgotI2lu Y2x1ZGUgPHd0Zi9MYW5ndWFnZS5oPgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW5j bHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5jbHVkZSA8d3RmL1Byb2Nlc3NQcml2aWxl Z2UuaD4KQEAgLTMwNSw4ICszMDQsNiBAQCBXZWJQcm9jZXNzUG9vbDo6V2ViUHJvY2Vzc1Bvb2wo QVBJOjpQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24mIGNvbmZpZ3VyYXRpb24pCiAKICAgICBwcm9j ZXNzUG9vbHMoKS5hcHBlbmQodGhpcyk7CiAKLSAgICBhZGRMYW5ndWFnZUNoYW5nZU9ic2VydmVy KHRoaXMsIGxhbmd1YWdlQ2hhbmdlZCk7Ci0KICAgICByZXNvbHZlUGF0aHNGb3JTYW5kYm94RXh0 ZW5zaW9ucygpOwogCiAjaWYgIUxPR19ESVNBQkxFRCB8fCAhUkVMRUFTRV9MT0dfRElTQUJMRUQK QEAgLTMzNiw4ICszMzMsNiBAQCBXZWJQcm9jZXNzUG9vbDo6fldlYlByb2Nlc3NQb29sKCkKICAg ICBib29sIHJlbW92ZWQgPSBwcm9jZXNzUG9vbHMoKS5yZW1vdmVGaXJzdCh0aGlzKTsKICAgICBB U1NFUlRfVU5VU0VEKHJlbW92ZWQsIHJlbW92ZWQpOwogCi0gICAgcmVtb3ZlTGFuZ3VhZ2VDaGFu Z2VPYnNlcnZlcih0aGlzKTsKLQogICAgIG1fbWVzc2FnZVJlY2VpdmVyTWFwLmludmFsaWRhdGUo KTsKIAogICAgIGZvciAoYXV0byYgc3VwcGxlbWVudCA6IG1fc3VwcGxlbWVudHMudmFsdWVzKCkp IHsKQEAgLTQxNywxNyArNDEyLDE0IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnNldEN1c3RvbVdl YkNvbnRlbnRTZXJ2aWNlQnVuZGxlSWRlbnRpZmllcihjb25zdCBTdHJpbmcmIGN1CiAgICAgbV9j b25maWd1cmF0aW9uLT5zZXRDdXN0b21XZWJDb250ZW50U2VydmljZUJ1bmRsZUlkZW50aWZpZXIo Y3VzdG9tV2ViQ29udGVudFNlcnZpY2VCdW5kbGVJZGVudGlmaWVyKTsKIH0KIAotdm9pZCBXZWJQ cm9jZXNzUG9vbDo6bGFuZ3VhZ2VDaGFuZ2VkKHZvaWQqIGNvbnRleHQpCit2b2lkIFdlYlByb2Nl c3NQb29sOjpzZXRPdmVycmlkZUxhbmd1YWdlcyhWZWN0b3I8U3RyaW5nPiYmIGxhbmd1YWdlcykK IHsKLSAgICBzdGF0aWNfY2FzdDxXZWJQcm9jZXNzUG9vbCo+KGNvbnRleHQpLT5sYW5ndWFnZUNo YW5nZWQoKTsKLX0KKyAgICBtX2NvbmZpZ3VyYXRpb24tPnNldE92ZXJyaWRlTGFuZ3VhZ2VzKFdU Rk1vdmUobGFuZ3VhZ2VzKSk7CiAKLXZvaWQgV2ViUHJvY2Vzc1Bvb2w6Omxhbmd1YWdlQ2hhbmdl ZCgpCi17Ci0gICAgc2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpVc2Vy UHJlZmVycmVkTGFuZ3VhZ2VzQ2hhbmdlZCgpKTsKKyAgICBzZW5kVG9BbGxQcm9jZXNzZXMoTWVz c2FnZXM6OldlYlByb2Nlc3M6OlVzZXJQcmVmZXJyZWRMYW5ndWFnZXNDaGFuZ2VkKG1fY29uZmln dXJhdGlvbi0+b3ZlcnJpZGVMYW5ndWFnZXMoKSkpOwogI2lmIFVTRShTT1VQKQogICAgIGZvciAo YXV0byBuZXR3b3JrUHJvY2VzcyA6IE5ldHdvcmtQcm9jZXNzUHJveHk6OmFsbE5ldHdvcmtQcm9j ZXNzZXMoKSkKLSAgICAgICAgbmV0d29ya1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQ cm9jZXNzOjpVc2VyUHJlZmVycmVkTGFuZ3VhZ2VzQ2hhbmdlZCh1c2VyUHJlZmVycmVkTGFuZ3Vh Z2VzKCkpLCAwKTsKKyAgICAgICAgbmV0d29ya1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Ok5ldHdv cmtQcm9jZXNzOjpVc2VyUHJlZmVycmVkTGFuZ3VhZ2VzQ2hhbmdlZChtX2NvbmZpZ3VyYXRpb24t Pm92ZXJyaWRlTGFuZ3VhZ2VzKCkpLCAwKTsKICNlbmRpZgogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAppbmRleCBiNzhiZmRlMjBiYTQuLmI0MGYwN2Q4Mjg5MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCkBAIC00ODksNyArNDg5 LDkgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVj dG9yeShTdHJpbmcmJiBkaXJlY3RvcnkpIHsgbV9qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVj dG9yeSA9IGRpcmVjdG9yeTsgfQogICAgIGNvbnN0IFN0cmluZyYgamF2YVNjcmlwdENvbmZpZ3Vy YXRpb25EaXJlY3RvcnkoKSBjb25zdCB7IHJldHVybiBtX2phdmFTY3JpcHRDb25maWd1cmF0aW9u RGlyZWN0b3J5OyB9Ci0gICAgCisKKyAgICB2b2lkIHNldE92ZXJyaWRlTGFuZ3VhZ2VzKFZlY3Rv cjxTdHJpbmc+JiYpOworCiAgICAgV2ViUHJvY2Vzc0RhdGFTdG9yZVBhcmFtZXRlcnMgd2ViUHJv Y2Vzc0RhdGFTdG9yZVBhcmFtZXRlcnMoV2ViUHJvY2Vzc1Byb3h5JiwgV2Vic2l0ZURhdGFTdG9y ZSYpOwogICAgIAogICAgIHN0YXRpYyB2b2lkIHNldFVzZVNlcGFyYXRlU2VydmljZVdvcmtlclBy b2Nlc3MoYm9vbCk7CkBAIC01NDcsOSArNTQ5LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZFJl Y2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIG92ZXJyaWRlOwog ICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVj b2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+Jikgb3ZlcnJpZGU7CiAKLSAgICBz dGF0aWMgdm9pZCBsYW5ndWFnZUNoYW5nZWQodm9pZCogY29udGV4dCk7Ci0gICAgdm9pZCBsYW5n dWFnZUNoYW5nZWQoKTsKLQogICAgIGJvb2wgdXNlc1NpbmdsZVdlYlByb2Nlc3MoKSBjb25zdCB7 IHJldHVybiBtX2NvbmZpZ3VyYXRpb24tPnVzZXNTaW5nbGVXZWJQcm9jZXNzKCk7IH0KIAogI2lm IFBMQVRGT1JNKENPQ09BKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCmlu ZGV4IDMwMWI4ODc3YjM1Ny4uMDM2MzA1MTZkNDZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlByb2Nlc3MuY3BwCkBAIC02NzYsOSArNjc2LDkgQEAgdm9pZCBXZWJQcm9jZXNzOjpzZXRT aG91bGRVc2VGb250U21vb3RoaW5nKGJvb2wgdXNlRm9udFNtb290aGluZykKICAgICBXZWJDb3Jl OjpGb250Q2FzY2FkZTo6c2V0U2hvdWxkVXNlU21vb3RoaW5nKHVzZUZvbnRTbW9vdGhpbmcpOwog fQogCi12b2lkIFdlYlByb2Nlc3M6OnVzZXJQcmVmZXJyZWRMYW5ndWFnZXNDaGFuZ2VkKCkgY29u c3QKK3ZvaWQgV2ViUHJvY2Vzczo6dXNlclByZWZlcnJlZExhbmd1YWdlc0NoYW5nZWQoY29uc3Qg VmVjdG9yPFN0cmluZz4mIGxhbmd1YWdlcykgY29uc3QKIHsKLSAgICBXVEY6Omxhbmd1YWdlRGlk Q2hhbmdlKCk7CisgICAgb3ZlcnJpZGVVc2VyUHJlZmVycmVkTGFuZ3VhZ2VzKGxhbmd1YWdlcyk7 CiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6ZnVsbEtleWJvYXJkQWNjZXNzTW9kZUNoYW5nZWQoYm9v bCBmdWxsS2V5Ym9hcmRBY2Nlc3NFbmFibGVkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlByb2Nlc3MuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9j ZXNzLmgKaW5kZXggZmM2YzM4NzJlYjA0Li5iNzRiYjIxODBlMjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlByb2Nlc3MuaApAQCAtNDI0LDcgKzQyNCw3IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBjbGVhclJlc291cmNlTG9hZFN0YXRpc3RpY3MoKTsKICAgICB2b2lkIGZsdXNoUmVzb3VyY2VM b2FkU3RhdGlzdGljcygpOwogICAgIHZvaWQgc2VlZFJlc291cmNlTG9hZFN0YXRpc3RpY3NGb3JU ZXN0aW5nKGNvbnN0IFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiBmaXJzdFBhcnR5RG9tYWlu LCBjb25zdCBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiYgdGhpcmRQYXJ0eURvbWFpbiwgYm9v bCBzaG91bGRTY2hlZHVsZU5vdGlmaWNhdGlvbiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYm KTsKLSAgICB2b2lkIHVzZXJQcmVmZXJyZWRMYW5ndWFnZXNDaGFuZ2VkKCkgY29uc3Q7CisgICAg dm9pZCB1c2VyUHJlZmVycmVkTGFuZ3VhZ2VzQ2hhbmdlZChjb25zdCBWZWN0b3I8U3RyaW5nPiYp IGNvbnN0OwogICAgIHZvaWQgZnVsbEtleWJvYXJkQWNjZXNzTW9kZUNoYW5nZWQoYm9vbCBmdWxs S2V5Ym9hcmRBY2Nlc3NFbmFibGVkKTsKIAogICAgIHZvaWQgcGxhdGZvcm1TZXRDYWNoZU1vZGVs KENhY2hlTW9kZWwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBy b2Nlc3MubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5t ZXNzYWdlcy5pbgppbmRleCBhNDNmYTBlMThkYWMuLjFkZDk0YzFhMDhmNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KKysrIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KQEAgLTQ4LDcgKzQ4 LDcgQEAgbWVzc2FnZXMgLT4gV2ViUHJvY2VzcyBMZWdhY3lSZWNlaXZlciBOb3RSZWZDb3VudGVk IHsKICAgICBTZXRTaG91bGRVc2VGb250U21vb3RoaW5nKGJvb2wgdXNlRm9udFNtb290aGluZykK ICAgICBTZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChib29sIHJlc291cmNlTG9hZFN0 YXRpc3RpY3NFbmFibGVkKTsKICAgICBDbGVhclJlc291cmNlTG9hZFN0YXRpc3RpY3MoKTsKLSAg ICBVc2VyUHJlZmVycmVkTGFuZ3VhZ2VzQ2hhbmdlZCgpCisgICAgVXNlclByZWZlcnJlZExhbmd1 YWdlc0NoYW5nZWQoVmVjdG9yPFN0cmluZz4gbGFuZ3VhZ2VzKQogICAgIEZ1bGxLZXlib2FyZEFj Y2Vzc01vZGVDaGFuZ2VkKGJvb2wgZnVsbEtleWJvYXJkQWNjZXNzRW5hYmxlZCkKIAogI2lmIEhB VkUoVUlLSVRfV0lUSF9NT1VTRV9TVVBQT1JUKSAmJiBQTEFURk9STShJT1MpCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjc4OWQwY2JjYWFkLi4w ODk0MjQzZTU2NGEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMi0yNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3Mg IDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjYzMDk0KTogW0dU S11bV1BFXSBBUEkgdGVzdCAvd2Via2l0L1dlYktpdFdlYkNvbnRleHQvbGFuZ3VhZ2VzIGlzIGZh aWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 ODExMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcDoK KyAgICAgICAgKHRlc3RXZWJDb250ZXh0TGFuZ3VhZ2VzKTogSW52YWxpZCBsb2NhbGUgaXMgaWdu b3JlZCBub3cgaW5zdGVhZCBvZiB0aHJvd2luZyBhIGV4Y2VwdGlvbi4KKyAgICAgICAgKiBUZXN0 V2ViS2l0QVBJL2dsaWIvVGVzdEV4cGVjdGF0aW9ucy5qc29uOiBSZW1vdmUgdGVzdCBleHBlY3Rh dGlvbiBub3cgdGhhdCBpdCBwYXNzZXMgYWdhaW4uCisKIDIwMjEtMDItMjQgIFBoaWxpcHBlIE5v cm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtGbGF0cGFrIFNES10gUEFU SCBmb3IgcnVzdGMgbm8gbG9uZ2VyIHNldCBjb3JyZWN0bHkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAgYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdlYktpdFdlYkNvbnRleHQu Y3BwCmluZGV4IGY4YjgxNzJjNzBkMi4uOWU5MjMzYWIwOTA3IDEwMDY0NAotLS0gYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwCisr KyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViQ29u dGV4dC5jcHAKQEAgLTM3OSwxMiArMzc5LDE0IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJDb250ZXh0 TGFuZ3VhZ2VzKFdlYlZpZXdUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogICAgIGxvY2FsZS5y ZXNldChXZWJWaWV3VGVzdDo6amF2YXNjcmlwdFJlc3VsdFRvQ1N0cmluZyhqYXZhc2NyaXB0UmVz dWx0KSk7CiAgICAgZ19hc3NlcnRfY21wc3RyKGxvY2FsZS5nZXQoKSwgPT0sIGV4cGVjdGVkRGVm YXVsdExhbmd1YWdlKTsKIAotICAgIC8vIEFuIGludmFsaWQgbG9jYWxlIHNob3VsZCB0aHJvdyBh biBleGNlcHRpb24uCisgICAgLy8gQW4gaW52YWxpZCBsb2NhbGUgc2hvdWxkIG5vdCBiZSB1c2Vk LgogICAgIGNvbnN0IGNoYXIqIGludmFsaWRMYW5ndWFnZVtdID0geyAiQSIsIG51bGxwdHIgfTsK ICAgICB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3ByZWZlcnJlZF9sYW5ndWFnZXModGVzdC0+bV93 ZWJDb250ZXh0LmdldCgpLCBpbnZhbGlkTGFuZ3VhZ2UpOwogICAgIGphdmFzY3JpcHRSZXN1bHQg PSB0ZXN0LT5ydW5KYXZhU2NyaXB0QW5kV2FpdFVudGlsRmluaXNoZWQoIkludGwuRGF0ZVRpbWVG b3JtYXQoKS5yZXNvbHZlZE9wdGlvbnMoKS5sb2NhbGUiLCAmZXJyb3Iub3V0UHRyKCkpOwogICAg IGdfYXNzZXJ0X25vbm51bGwoamF2YXNjcmlwdFJlc3VsdCk7Ci0gICAgZ19hc3NlcnRfZXJyb3Io ZXJyb3IuZ2V0KCksIFdFQktJVF9KQVZBU0NSSVBUX0VSUk9SLCBXRUJLSVRfSkFWQVNDUklQVF9F UlJPUl9TQ1JJUFRfRkFJTEVEKTsKKyAgICBnX2Fzc2VydF9ub19lcnJvcihlcnJvci5nZXQoKSk7 CisgICAgbG9jYWxlLnJlc2V0KFdlYlZpZXdUZXN0OjpqYXZhc2NyaXB0UmVzdWx0VG9DU3RyaW5n KGphdmFzY3JpcHRSZXN1bHQpKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIobG9jYWxlLmdldCgpLCAh PSwgIkEiKTsKIH0KIAogI2lmIFVTRShTT1VQMikKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvZ2xpYi9UZXN0RXhwZWN0YXRpb25zLmpzb24gYi9Ub29scy9UZXN0V2ViS2l0QVBJL2ds aWIvVGVzdEV4cGVjdGF0aW9ucy5qc29uCmluZGV4IDdmZDgzNjM5OTM5OS4uY2QxMGJlODhmZTMx IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvVGVzdEV4cGVjdGF0aW9ucy5q c29uCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9UZXN0RXhwZWN0YXRpb25zLmpzb24K QEAgLTExMSw5ICsxMTEsNiBAQAogICAgICAgICAgICAgIi93ZWJraXQvV2ViS2l0V2ViQ29udGV4 dC91cmktc2NoZW1lIjogewogICAgICAgICAgICAgICAgICJleHBlY3RlZCI6IHsiYWxsIjogeyJz dGF0dXMiOiBbIkZBSUwiLCAiUEFTUyJdLCAiYnVnIjogIndlYmtpdC5vcmcvYi8xODMxODMifX0K ICAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAiL3dlYmtpdC9XZWJLaXRXZWJDb250ZXh0L2xh bmd1YWdlcyI6IHsKLSAgICAgICAgICAgICAgICAiZXhwZWN0ZWQiOiB7ImFsbCI6IHsic3RhdHVz IjogWyJGQUlMIl0sICJidWciOiAid2Via2l0Lm9yZy9iLzE4ODExMSJ9fQotICAgICAgICAgICAg fSwKICAgICAgICAgICAgICIvd2Via2l0L1dlYktpdFdlYkNvbnRleHQvcHJveHkiOiB7CiAgICAg ICAgICAgICAgICAgImV4cGVjdGVkIjogeyJhbGwiOiB7InN0YXR1cyI6IFsiRkFJTCIsICJQQVNT Il0sICJidWciOiAid2Via2l0Lm9yZy9iLzIyMjA5MCJ9fQogICAgICAgICAgICAgfQo=