212628 2020-06-02 00:39:26 -0700 REGRESSION (r258949): Dynamic user accent color changes are not respected by WKWebView 2020-06-02 11:04:11 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton aestes bfulgham darin pvollan simon.fraser timothy webkit-bug-importer wenson_hsieh oldest_to_newest 1658183 0 thorton 2020-06-02 00:39:26 -0700 REGRESSION (r258949): Dynamic user accent color changes are not respected by WKWebView 1658184 1 400790 thorton 2020-06-02 00:40:03 -0700 Created attachment 400790 Patch 1658185 2 thorton 2020-06-02 00:40:05 -0700 <rdar://problem/63436275> 1658210 3 400796 thorton 2020-06-02 01:45:46 -0700 Created attachment 400796 Patch 1658312 4 400796 pvollan 2020-06-02 08:35:32 -0700 Comment on attachment 400796 Patch Thanks for fixing this! R=me. 1658354 5 thorton 2020-06-02 10:09:52 -0700 https://trac.webkit.org/changeset/262427/webkit 1658374 6 400796 darin 2020-06-02 10:55:04 -0700 Comment on attachment 400796 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400796&action=review > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:926 > +static const WTF::String& userAccentColorPreferenceKey() > +{ > + static NeverDestroyed<WTF::String> userAccentColorPreferenceKey(MAKE_STATIC_STRING_IMPL("AppleAccentColor")); > + return userAccentColorPreferenceKey; > +} Possible future tidying step. Seems like this could return a const char* or an ASCIILiteral instead. No need for a NeverDestroyed, and comparing a WTF::String is not faster with another WTF::String than it is with a const char*. Or this could be userAccentColorPreferenceKey() instead. 1658380 7 thorton 2020-06-02 11:04:11 -0700 (In reply to Darin Adler from comment #6) > Comment on attachment 400796 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=400796&action=review > > > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:926 > > +static const WTF::String& userAccentColorPreferenceKey() > > +{ > > + static NeverDestroyed<WTF::String> userAccentColorPreferenceKey(MAKE_STATIC_STRING_IMPL("AppleAccentColor")); > > + return userAccentColorPreferenceKey; > > +} > > Possible future tidying step. Seems like this could return a const char* or > an ASCIILiteral instead. No need for a NeverDestroyed, and comparing a > WTF::String is not faster with another WTF::String than it is with a const > char*. > > Or this could be userAccentColorPreferenceKey() instead. Heh, I followed what we did with all of our generated preference keys. OK! This is good to know. 400790 2020-06-02 00:40:03 -0700 2020-06-02 01:45:44 -0700 Patch bug-212628-20200602004002.patch text/plain 5106 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFjNDM1YzgxNzkyNWJiMmI3 M2U3NDQ0Y2NmNGQ5ZTVkOGZjOTgwNjIuLjg3YjdlZmQ1MTFkMmE1NDhhZDE0ZWZhZjFkOGY1YTQ2 ZjdjZDA5NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMjAtMDYtMDIgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI1 ODk0OSk6IER5bmFtaWMgdXNlciBhY2NlbnQgY29sb3IgY2hhbmdlcyBhcmUgbm90IHJlc3BlY3Rl ZCBieSBXS1dlYlZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxMjYyOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjM0MzYyNzU+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHdvIGlzc3VlcyB3aXRo IHRoZSAiQ0ZQcmVmcyBEaXJlY3QgTW9kZSIgbWVjaGFuaXNtIGNhdXNlZCBkeW5hbWljIGNoYW5n ZXMgdG8gdGhlCisgICAgICAgIHVzZXIgYWNjZW50IGNvbG9yIHByZWZlcmVuY2UgdG8gbm90IGJl IHJlc3BlY3RlZCBhbnltb3JlOgorCisgICAgICAgIC0gdGhlIGRlZmF1bHQgY2hhbmdlLCB3aGVu IHN5bmNocm9uaXplZCB0byB0aGUgV2ViIENvbnRlbnQgcHJvY2Vzcywgd2FzCisgICAgICAgIHdy aXR0ZW4gaW50byB0aGUgd3JvbmcgZG9tYWluLCBiZWNhdXNlIG9mIGJ1ZyAyMTI2MjcuCisKKyAg ICAgICAgLSBBcHBLaXQgY2FjaGVzIHRoZSByZXNvbHZlZCBhY2NlbnQgY29sb3I7IHRoZSBjYWNo ZSBpcyBpbnZhbGlkYXRlZCB3aGVuIHRoZQorICAgICAgICBhIENvcmVVSSBub3RpZmljYXRpb24g aXMgcG9zdGVkLiBTaW5jZSB3ZSBzeW5jaHJvbml6ZSBwcmVmZXJlbmNlcyBvdXJzZWx2ZXMsCisg ICAgICAgIHRoZSBvcmRlcmluZyBvZiB0aGUgZGVmYXVsdCBjaGFuZ2UgYW5kIG5vdGlmaWNhdGlv biBhcmUgbm8gbG9uZ2VyIGd1YXJhbnRlZWQsCisgICAgICAgIHNvIEFwcEtpdCBzb21ldGltZXMg cmVhZHMgYW5kIHJlLWNhY2hlcyB0aGUgb2xkIGFjY2VudCBjb2xvci4KKworICAgICAgICAqIFdl YlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0Ojp1c2Vy QWNjZW50Q29sb3JQcmVmZXJlbmNlS2V5KToKKyAgICAgICAgKFdlYktpdDo6c2hvdWxkV3JpdGVU b0FwcERvbWFpbkZvclByZWZlcmVuY2VLZXkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz Ojpub3RpZnlQcmVmZXJlbmNlc0NoYW5nZWQpOgorICAgICAgICBUbyBmaXggdGhlIGZpcnN0IHBy b2JsZW0sIHdyaXRlIHRoZSBkZWZhdWx0IGludG8gdGhlIHN0YW5kYXJkVXNlckRlZmF1bHRzLgor ICAgICAgICBUaGlzIGlzIGp1c3QgYSB3b3JrYXJvdW5kLCB3ZSBuZWVkIGEgbW9yZSBnZW5lcmFs IHNvbHV0aW9uIHRvIHRoaXMgcHJvYmxlbQorICAgICAgICBmb3IgYWxsIGdsb2JhbCBwcmVmZXJl bmNlcy4gV2Uga25vdyBpdCdzIE9LIGluIHRoaXMgY2FzZSwgYmVjYXVzZSBBcHBLaXQKKyAgICAg ICAgaGFwcGVucyB0byByZWFkIGZyb20gc3RhbmRhcmRVc2VyRGVmYXVsdHMuCisKKyAgICAgICAg KFdlYktpdDo6ZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJlZmVyZW5jZUNoYW5n ZSk6CisgICAgICAgIFRvIGZpeCB0aGUgc2Vjb25kIHByb2JsZW0sIHJlLWVtaXQgdGhlIG5vdGlm aWNhdGlvbiBvbmNlIHdlIGhhdmUgc3luY2hyb25pemVkCisgICAgICAgIHRoZSBwcmVmZXJlbmNl IHRvIHRoZSBXZWIgQ29udGVudCBwcm9jZXNzLgorCiAyMDIwLTA1LTI5ICBKZXIgTm9ibGUgIDxq ZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWMsV0syXSBGdWxsc2NyZWVuIGFuaW1h dGlvbiBtaXNzaW5nIGEgZmV3IGZyYW1lcyBhdCBiZWdpbm5pbmcKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0gYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCmluZGV4IDhjNmU0MzkzNDcx MmYzMjc1MmI3OWNlNGQyOTBjODlkODRlZGY2NjAuLjdiZDBiMDYwZGUzMDM5OTUyMmU4MDc2ZWNi ZGFjN2U1ZTZkODM2ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2Nv YS9XZWJQcm9jZXNzQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29h L1dlYlByb2Nlc3NDb2NvYS5tbQpAQCAtOTE3LDExICs5MTcsNDggQEAgdm9pZCBXZWJQcm9jZXNz OjpzZXRNZWRpYU1JTUVUeXBlcyhjb25zdCBWZWN0b3I8U3RyaW5nPiB0eXBlcykKIH0KIAogI2lm IEVOQUJMRShDRlBSRUZTX0RJUkVDVF9NT0RFKQorCisjaWYgVVNFKEFQUEtJVCkKK3N0YXRpYyBj b25zdCBXVEY6OlN0cmluZyYgdXNlckFjY2VudENvbG9yUHJlZmVyZW5jZUtleSgpCit7CisgICAg c3RhdGljIE5ldmVyRGVzdHJveWVkPFdURjo6U3RyaW5nPiB1c2VyQWNjZW50Q29sb3JQcmVmZXJl bmNlS2V5KE1BS0VfU1RBVElDX1NUUklOR19JTVBMKCJBcHBsZUFjY2VudENvbG9yIikpOworICAg IHJldHVybiB1c2VyQWNjZW50Q29sb3JQcmVmZXJlbmNlS2V5OworfQorCitzdGF0aWMgQk9PTCBz aG91bGRXcml0ZVRvQXBwRG9tYWluRm9yUHJlZmVyZW5jZUtleShjb25zdCBTdHJpbmcmIGtleSkK K3sKKyAgICByZXR1cm4ga2V5ID09IHVzZXJBY2NlbnRDb2xvclByZWZlcmVuY2VLZXkoKTsKK30K KyNlbmRpZgorCitzdGF0aWMgdm9pZCBkaXNwYXRjaFNpbXVsYXRlZE5vdGlmaWNhdGlvbnNGb3JQ cmVmZXJlbmNlQ2hhbmdlKGNvbnN0IFN0cmluZyYga2V5KQoreworI2lmIFVTRShBUFBLSVQpCisg ICAgLy8gT3JkaW5hcmlseSwgb3RoZXIgcGFydHMgb2YgdGhlIHN5c3RlbSBlbnN1cmUgdGhhdCB0 aGlzIG5vdGlmaWNhdGlvbiBpcyBwb3N0ZWQgYWZ0ZXIgdGhpcyBkZWZhdWx0IGlzIGNoYW5nZWQu CisgICAgLy8gSG93ZXZlciwgc2luY2Ugd2Ugc3luY2hyb25pemUgZGVmYXVsdHMgdG8gdGhlIFdl YiBDb250ZW50IHByb2Nlc3MgdXNpbmcgYSBtZWNoYW5pc20gbm90IGtub3duIHRvIHRoZSByZXN0 CisgICAgLy8gb2YgdGhlIHN5c3RlbSwgd2UgbXVzdCByZS1wb3N0IHRoZSBub3RpZmljYXRpb24g aW4gdGhlIFdlYiBDb250ZW50IHByb2Nlc3MgYWZ0ZXIgdXBkYXRpbmcgdGhlIGRlZmF1bHQuCisg ICAgaWYgKGtleSA9PSB1c2VyQWNjZW50Q29sb3JQcmVmZXJlbmNlS2V5KCkpCisgICAgICAgIFtb TlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcG9zdE5vdGlmaWNhdGlvbk5hbWU6 QCJrQ1VJTm90aWZpY2F0aW9uQXF1YUNvbG9yVmFyaWFudENoYW5nZWQiIG9iamVjdDpuaWxdOwor I2VuZGlmCit9CisKIHZvaWQgV2ViUHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXNDaGFuZ2VkKGNv bnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgT3B0aW9uYWw8U3Ry aW5nPiYgZW5jb2RlZFZhbHVlKQogewotICAgIGF1dG8gZGVmYXVsdHMgPSBhZG9wdE5TKFtbTlNV c2VyRGVmYXVsdHMgYWxsb2NdIGluaXRXaXRoU3VpdGVOYW1lOmRvbWFpbl0pOworICAgIC8vIEZJ WE1FICgyMTI2MjcpOiBJbiB0aGUgY2FzZSBvZiBnbG9iYWwgcHJlZmVyZW5jZSBjaGFuZ2VzLCB0 aGUgZG9tYWluIHRoYXQgd2UgYXJlIG5vdGlmaWVkIGluIGlzCisgICAgLy8gbm90IHRoZSBjb3Jy ZWN0IGRvbWFpbiB0byB3cml0ZSB0bzsgaXQgaXMgYW4gYXJiaXRyYXJ5IGRvbWFpbiBhZmZlY3Rl ZCBieSB0aGUgZ2xvYmFsIGNoYW5nZS4KKyAgICAvLyBXb3JrIGFyb3VuZCB0aGlzIGJ5IHdyaXRp bmcgdG8gdGhlIGFwcCdzIGRvbWFpbiBpbiBjYXNlcyB3aGVyZSB3ZSBrbm93IHRoYXQgaXMgT0sK KyAgICAvLyAoYmVjYXVzZSB0aGUgY29kZSB0aGF0IHVzZXMgdGhlIGRlZmF1bHQgaW4gdGhlIFdl YiBDb250ZW50IHByb2Nlc3MgcmVhZHMgZnJvbQorICAgIC8vIC1zdGFuZGFyZFVzZXJEZWZhdWx0 cywgbm90IGZyb20gYSBzcGVjaWZpYyBkb21haW4pLiBQcmVmZXJlbmNlT2JzZXJ2ZXIgbmVlZHMg dG8gYmUgZml4ZWQKKyAgICAvLyB0byBmaW5kIHRoZSBjb3JyZWN0IGRvbWFpbiwgYnV0IHdlIGN1 cnJlbnRseSBoYXZlIG5vIG1lY2hhbmlzbSB0byBkbyBzby4KKyAgICBSZXRhaW5QdHI8TlNVc2Vy RGVmYXVsdHM+IGRlZmF1bHRzOworICAgIGlmIChzaG91bGRXcml0ZVRvQXBwRG9tYWluRm9yUHJl ZmVyZW5jZUtleShrZXkpKQorICAgICAgICBkZWZhdWx0cyA9IFtOU1VzZXJEZWZhdWx0cyBzdGFu ZGFyZFVzZXJEZWZhdWx0c107CisgICAgZWxzZQorICAgICAgICBkZWZhdWx0cyA9IGFkb3B0TlMo W1tOU1VzZXJEZWZhdWx0cyBhbGxvY10gaW5pdFdpdGhTdWl0ZU5hbWU6ZG9tYWluXSk7CisKICAg ICBpZiAoIWVuY29kZWRWYWx1ZS5oYXNWYWx1ZSgpKSB7CiAgICAgICAgIFtkZWZhdWx0cyBzZXRP YmplY3Q6bmlsIGZvcktleTprZXldOworICAgICAgICBkaXNwYXRjaFNpbXVsYXRlZE5vdGlmaWNh dGlvbnNGb3JQcmVmZXJlbmNlQ2hhbmdlKGtleSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAg ICAgYXV0byBlbmNvZGVkRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQmFz ZTY0RW5jb2RlZFN0cmluZzoqZW5jb2RlZFZhbHVlIG9wdGlvbnM6MF0pOwpAQCAtOTM0LDYgKzk3 MSw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXNDaGFuZ2VkKGNvbnN0IFN0 cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtlCiAgICAgaWYgKGVycikKICAgICAgICAgcmV0 dXJuOwogICAgIFtkZWZhdWx0cyBzZXRPYmplY3Q6b2JqZWN0IGZvcktleTprZXldOworICAgIGRp c3BhdGNoU2ltdWxhdGVkTm90aWZpY2F0aW9uc0ZvclByZWZlcmVuY2VDaGFuZ2Uoa2V5KTsKIH0K IAogdm9pZCBXZWJQcm9jZXNzOjp1bmJsb2NrUHJlZmVyZW5jZVNlcnZpY2UoU2FuZGJveEV4dGVu c2lvbjo6SGFuZGxlQXJyYXkmJiBoYW5kbGVBcnJheSkK 400796 2020-06-02 01:45:46 -0700 2020-06-02 08:35:32 -0700 Patch bug-212628-20200602014545.patch text/plain 5192 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA0MzExMzZmMDk1MDhkODM2 ODYwMjU5ODQ2ODI4NjFiYjZmNmQ4ODMuLjIzNjMzOTc3MmFlMTZlZjU3ZDMzZDhhN2IyOTIyODZm N2QzMzY5YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMjAtMDYtMDIgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI1 ODk0OSk6IER5bmFtaWMgdXNlciBhY2NlbnQgY29sb3IgY2hhbmdlcyBhcmUgbm90IHJlc3BlY3Rl ZCBieSBXS1dlYlZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxMjYyOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjM0MzYyNzU+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHdvIGlzc3VlcyB3aXRo IHRoZSAiQ0ZQcmVmcyBEaXJlY3QgTW9kZSIgbWVjaGFuaXNtIGNhdXNlZCBkeW5hbWljIGNoYW5n ZXMgdG8gdGhlCisgICAgICAgIHVzZXIgYWNjZW50IGNvbG9yIHByZWZlcmVuY2UgdG8gbm90IGJl IHJlc3BlY3RlZCBhbnltb3JlOgorCisgICAgICAgIC0gdGhlIGRlZmF1bHQgY2hhbmdlLCB3aGVu IHN5bmNocm9uaXplZCB0byB0aGUgV2ViIENvbnRlbnQgcHJvY2Vzcywgd2FzCisgICAgICAgIHdy aXR0ZW4gaW50byB0aGUgd3JvbmcgZG9tYWluLCBiZWNhdXNlIG9mIGJ1ZyAyMTI2MjcuCisKKyAg ICAgICAgLSBBcHBLaXQgY2FjaGVzIHRoZSByZXNvbHZlZCBhY2NlbnQgY29sb3I7IHRoZSBjYWNo ZSBpcyBpbnZhbGlkYXRlZCB3aGVuIHRoZQorICAgICAgICBhIENvcmVVSSBub3RpZmljYXRpb24g aXMgcG9zdGVkLiBTaW5jZSB3ZSBzeW5jaHJvbml6ZSBwcmVmZXJlbmNlcyBvdXJzZWx2ZXMsCisg ICAgICAgIHRoZSBvcmRlcmluZyBvZiB0aGUgZGVmYXVsdCBjaGFuZ2UgYW5kIG5vdGlmaWNhdGlv biBhcmUgbm8gbG9uZ2VyIGd1YXJhbnRlZWQsCisgICAgICAgIHNvIEFwcEtpdCBzb21ldGltZXMg cmVhZHMgYW5kIHJlLWNhY2hlcyB0aGUgb2xkIGFjY2VudCBjb2xvci4KKworICAgICAgICAqIFdl YlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0Ojp1c2Vy QWNjZW50Q29sb3JQcmVmZXJlbmNlS2V5KToKKyAgICAgICAgKFdlYktpdDo6c2hvdWxkV3JpdGVU b0FwcERvbWFpbkZvclByZWZlcmVuY2VLZXkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz Ojpub3RpZnlQcmVmZXJlbmNlc0NoYW5nZWQpOgorICAgICAgICBUbyBmaXggdGhlIGZpcnN0IHBy b2JsZW0sIHdyaXRlIHRoZSBkZWZhdWx0IGludG8gdGhlIHN0YW5kYXJkVXNlckRlZmF1bHRzLgor ICAgICAgICBUaGlzIGlzIGp1c3QgYSB3b3JrYXJvdW5kLCB3ZSBuZWVkIGEgbW9yZSBnZW5lcmFs IHNvbHV0aW9uIHRvIHRoaXMgcHJvYmxlbQorICAgICAgICBmb3IgYWxsIGdsb2JhbCBwcmVmZXJl bmNlcy4gV2Uga25vdyBpdCdzIE9LIGluIHRoaXMgY2FzZSwgYmVjYXVzZSBBcHBLaXQKKyAgICAg ICAgaGFwcGVucyB0byByZWFkIGZyb20gc3RhbmRhcmRVc2VyRGVmYXVsdHMuCisKKyAgICAgICAg KFdlYktpdDo6ZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpb25zRm9yUHJlZmVyZW5jZUNoYW5n ZSk6CisgICAgICAgIFRvIGZpeCB0aGUgc2Vjb25kIHByb2JsZW0sIHJlLWVtaXQgdGhlIG5vdGlm aWNhdGlvbiBvbmNlIHdlIGhhdmUgc3luY2hyb25pemVkCisgICAgICAgIHRoZSBwcmVmZXJlbmNl IHRvIHRoZSBXZWIgQ29udGVudCBwcm9jZXNzLgorCiAyMDIwLTA2LTAxICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHRocmVhZC1zYWZldHkgaXNzdWUgaW4g W1dLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciBfaGFuZGxlQmFja2dyb3Vu ZFRhc2tFeHBpcmF0aW9uXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2Nv Y29hL1dlYlByb2Nlc3NDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9X ZWJQcm9jZXNzQ29jb2EubW0KaW5kZXggOGM2ZTQzOTM0NzEyZjMyNzUyYjc5Y2U0ZDI5MGM4OWQ4 NGVkZjY2MC4uYjg2Njg2MzA3NWI4Mzc1ZjY1NTZmZWRhNDViNzU5OGQ4ZGQwZTgzNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCkBA IC05MTcsMTEgKzkxNyw1MiBAQCB2b2lkIFdlYlByb2Nlc3M6OnNldE1lZGlhTUlNRVR5cGVzKGNv bnN0IFZlY3RvcjxTdHJpbmc+IHR5cGVzKQogfQogCiAjaWYgRU5BQkxFKENGUFJFRlNfRElSRUNU X01PREUpCisKKyNpZiBVU0UoQVBQS0lUKQorc3RhdGljIGNvbnN0IFdURjo6U3RyaW5nJiB1c2Vy QWNjZW50Q29sb3JQcmVmZXJlbmNlS2V5KCkKK3sKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8 V1RGOjpTdHJpbmc+IHVzZXJBY2NlbnRDb2xvclByZWZlcmVuY2VLZXkoTUFLRV9TVEFUSUNfU1RS SU5HX0lNUEwoIkFwcGxlQWNjZW50Q29sb3IiKSk7CisgICAgcmV0dXJuIHVzZXJBY2NlbnRDb2xv clByZWZlcmVuY2VLZXk7Cit9CisjZW5kaWYKKworc3RhdGljIGJvb2wgc2hvdWxkV3JpdGVUb0Fw cERvbWFpbkZvclByZWZlcmVuY2VLZXkoY29uc3QgU3RyaW5nJiBrZXkpCit7CisjaWYgVVNFKEFQ UEtJVCkKKyAgICByZXR1cm4ga2V5ID09IHVzZXJBY2NlbnRDb2xvclByZWZlcmVuY2VLZXkoKTsK KyNlbHNlCisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCit9CisKK3N0YXRpYyB2b2lkIGRpc3Bh dGNoU2ltdWxhdGVkTm90aWZpY2F0aW9uc0ZvclByZWZlcmVuY2VDaGFuZ2UoY29uc3QgU3RyaW5n JiBrZXkpCit7CisjaWYgVVNFKEFQUEtJVCkKKyAgICAvLyBPcmRpbmFyaWx5LCBvdGhlciBwYXJ0 cyBvZiB0aGUgc3lzdGVtIGVuc3VyZSB0aGF0IHRoaXMgbm90aWZpY2F0aW9uIGlzIHBvc3RlZCBh ZnRlciB0aGlzIGRlZmF1bHQgaXMgY2hhbmdlZC4KKyAgICAvLyBIb3dldmVyLCBzaW5jZSB3ZSBz eW5jaHJvbml6ZSBkZWZhdWx0cyB0byB0aGUgV2ViIENvbnRlbnQgcHJvY2VzcyB1c2luZyBhIG1l Y2hhbmlzbSBub3Qga25vd24gdG8gdGhlIHJlc3QKKyAgICAvLyBvZiB0aGUgc3lzdGVtLCB3ZSBt dXN0IHJlLXBvc3QgdGhlIG5vdGlmaWNhdGlvbiBpbiB0aGUgV2ViIENvbnRlbnQgcHJvY2VzcyBh ZnRlciB1cGRhdGluZyB0aGUgZGVmYXVsdC4KKyAgICBpZiAoa2V5ID09IHVzZXJBY2NlbnRDb2xv clByZWZlcmVuY2VLZXkoKSkKKyAgICAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0 Q2VudGVyXSBwb3N0Tm90aWZpY2F0aW9uTmFtZTpAImtDVUlOb3RpZmljYXRpb25BcXVhQ29sb3JW YXJpYW50Q2hhbmdlZCIgb2JqZWN0Om5pbF07CisjZW5kaWYKK30KKwogdm9pZCBXZWJQcm9jZXNz Ojpub3RpZnlQcmVmZXJlbmNlc0NoYW5nZWQoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0 cmluZyYga2V5LCBjb25zdCBPcHRpb25hbDxTdHJpbmc+JiBlbmNvZGVkVmFsdWUpCiB7Ci0gICAg YXV0byBkZWZhdWx0cyA9IGFkb3B0TlMoW1tOU1VzZXJEZWZhdWx0cyBhbGxvY10gaW5pdFdpdGhT dWl0ZU5hbWU6ZG9tYWluXSk7CisgICAgLy8gRklYTUUgKDIxMjYyNyk6IEluIHRoZSBjYXNlIG9m IGdsb2JhbCBwcmVmZXJlbmNlIGNoYW5nZXMsIHRoZSBkb21haW4gdGhhdCB3ZSBhcmUgbm90aWZp ZWQgaW4gaXMKKyAgICAvLyBub3QgdGhlIGNvcnJlY3QgZG9tYWluIHRvIHdyaXRlIHRvOyBpdCBp cyBhbiBhcmJpdHJhcnkgZG9tYWluIGFmZmVjdGVkIGJ5IHRoZSBnbG9iYWwgY2hhbmdlLgorICAg IC8vIFdvcmsgYXJvdW5kIHRoaXMgYnkgd3JpdGluZyB0byB0aGUgYXBwJ3MgZG9tYWluIGluIGNh c2VzIHdoZXJlIHdlIGtub3cgdGhhdCBpcyBPSworICAgIC8vIChiZWNhdXNlIHRoZSBjb2RlIHRo YXQgdXNlcyB0aGUgZGVmYXVsdCBpbiB0aGUgV2ViIENvbnRlbnQgcHJvY2VzcyByZWFkcyBmcm9t CisgICAgLy8gLXN0YW5kYXJkVXNlckRlZmF1bHRzLCBub3QgZnJvbSBhIHNwZWNpZmljIGRvbWFp bikuIFByZWZlcmVuY2VPYnNlcnZlciBuZWVkcyB0byBiZSBmaXhlZAorICAgIC8vIHRvIGZpbmQg dGhlIGNvcnJlY3QgZG9tYWluLCBidXQgd2UgY3VycmVudGx5IGhhdmUgbm8gbWVjaGFuaXNtIHRv IGRvIHNvLgorICAgIFJldGFpblB0cjxOU1VzZXJEZWZhdWx0cz4gZGVmYXVsdHM7CisgICAgaWYg KHNob3VsZFdyaXRlVG9BcHBEb21haW5Gb3JQcmVmZXJlbmNlS2V5KGtleSkpCisgICAgICAgIGRl ZmF1bHRzID0gW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXTsKKyAgICBlbHNl CisgICAgICAgIGRlZmF1bHRzID0gYWRvcHROUyhbW05TVXNlckRlZmF1bHRzIGFsbG9jXSBpbml0 V2l0aFN1aXRlTmFtZTpkb21haW5dKTsKKwogICAgIGlmICghZW5jb2RlZFZhbHVlLmhhc1ZhbHVl KCkpIHsKICAgICAgICAgW2RlZmF1bHRzIHNldE9iamVjdDpuaWwgZm9yS2V5OmtleV07CisgICAg ICAgIGRpc3BhdGNoU2ltdWxhdGVkTm90aWZpY2F0aW9uc0ZvclByZWZlcmVuY2VDaGFuZ2Uoa2V5 KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBhdXRvIGVuY29kZWREYXRhID0gYWRvcHRO UyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhCYXNlNjRFbmNvZGVkU3RyaW5nOiplbmNvZGVkVmFs dWUgb3B0aW9uczowXSk7CkBAIC05MzQsNiArOTc1LDcgQEAgdm9pZCBXZWJQcm9jZXNzOjpub3Rp ZnlQcmVmZXJlbmNlc0NoYW5nZWQoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYg a2UKICAgICBpZiAoZXJyKQogICAgICAgICByZXR1cm47CiAgICAgW2RlZmF1bHRzIHNldE9iamVj dDpvYmplY3QgZm9yS2V5OmtleV07CisgICAgZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRpb25z Rm9yUHJlZmVyZW5jZUNoYW5nZShrZXkpOwogfQogCiB2b2lkIFdlYlByb2Nlc3M6OnVuYmxvY2tQ cmVmZXJlbmNlU2VydmljZShTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSYmIGhhbmRsZUFy cmF5KQo=