188028 2018-07-25 16:30:26 -0700 ERROR: Unhandled web process message 'WebPage:SetUseDarkAppearance' when browsing in dark mode 2018-07-26 12:50:26 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen bdakin commit-queue ggaren thorton timothy webkit-bug-importer wenson_hsieh oldest_to_newest 1445213 0 cdumez 2018-07-25 16:30:26 -0700 ERROR: Unhandled web process message 'WebPage:SetUseDarkAppearance' when browsing in dark mode. 1445215 1 345800 cdumez 2018-07-25 16:34:05 -0700 Created attachment 345800 Patch 1445229 2 345800 wenson_hsieh 2018-07-25 17:06:15 -0700 Comment on attachment 345800 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345800&action=review > Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm:1316 > + m_page->setUseDarkAppearance(effectiveAppearanceIsDark()); Doesn't this mean that the WebPageCreationParameters sent over when initializing the web process won't have the right value for `useDarkAppearance`? 1445231 3 345800 cdumez 2018-07-25 17:10:13 -0700 Comment on attachment 345800 Patch Will check. 1445232 4 345800 achristensen 2018-07-25 17:10:57 -0700 Comment on attachment 345800 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345800&action=review >> Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm:1316 >> + m_page->setUseDarkAppearance(effectiveAppearanceIsDark()); > > Doesn't this mean that the WebPageCreationParameters sent over when initializing the web process won't have the right value for `useDarkAppearance`? We shouldn't even need to set this if it's in the WebPageCreationParameters 1445240 5 345800 wenson_hsieh 2018-07-25 17:24:46 -0700 Comment on attachment 345800 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345800&action=review >>> Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm:1316 >>> + m_page->setUseDarkAppearance(effectiveAppearanceIsDark()); >> >> Doesn't this mean that the WebPageCreationParameters sent over when initializing the web process won't have the right value for `useDarkAppearance`? > > We shouldn't even need to set this if it's in the WebPageCreationParameters Hm...I'm not sure I understand this comment. In WebPageProxy::creationParameters(), we have: parameters.useDarkAppearance = m_useDarkAppearance; ...and m_useDarkAppearance may not be the right value then if we haven't called WebPageProxy::setUseDarkAppearance yet. It seems that either: - we should set m_useDarkAppearance to the right value but avoid sending IPC to WebPage before sending WebPageCreationParameters, or... - maybe it doesn't matter that the useDarkAppearance bit is the right value during web process creation, since we'll just end up setting it in the next IPC message anyways and this tweak here is okay. 1445254 6 cdumez 2018-07-25 18:00:20 -0700 I did not realize it was part of WebPageCreationParameters. In this case, I will avoid sending the IPC if this is called before initialization. If it is called later ton (e.g. preference changes while Safari is running), then we still want to send the IPC. 1445263 7 cdumez 2018-07-25 18:31:19 -0700 (In reply to Chris Dumez from comment #6) > I did not realize it was part of WebPageCreationParameters. In this case, I > will avoid sending the IPC if this is called before initialization. If it is > called later ton (e.g. preference changes while Safari is running), then we > still want to send the IPC. Hmm, looks like there is currently no flag telling if initializeWebPage() was called yet or not. 1445479 8 345857 cdumez 2018-07-26 11:51:42 -0700 Created attachment 345857 Patch 1445490 9 345857 commit-queue 2018-07-26 12:49:16 -0700 Comment on attachment 345857 Patch Clearing flags on attachment: 345857 Committed r234268: <https://trac.webkit.org/changeset/234268> 1445491 10 commit-queue 2018-07-26 12:49:17 -0700 All reviewed patches have been landed. Closing bug. 1445494 11 webkit-bug-importer 2018-07-26 12:50:26 -0700 <rdar://problem/42634537> 345800 2018-07-25 16:34:05 -0700 2018-07-25 18:00:30 -0700 Patch bug-188028-20180725163404.patch text/plain 1556 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MjE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxOWM3ZTQ5OGZmMWJjYTc3 ZjFlNTg2OGI5YWQ5NmZhOTdiZDBiYjEuLmZkZjJlNzg5MTY3MzRjZGFiNTYzZDc0MTg2ODRhODU4 NGY5NjE4OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMDctMjUgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBFUlJPUjogVW5oYW5kbGVkIHdlYiBw cm9jZXNzIG1lc3NhZ2UgJ1dlYlBhZ2U6U2V0VXNlRGFya0FwcGVhcmFuY2UnIHdoZW4gYnJvd3Np bmcgaW4gZGFyayBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODgwMjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBNb3ZlIHRoZSBjYWxsIHRvIHNldFVzZURhcmtBcHBlYXJhbmNlKCkgYWZ0ZXIgdGhl IGNhbGwgdG8gaW5pdGlhbGl6ZVdlYlBhZ2UoKSBzaW5jZSB0aGUgV2ViUGFnZQorICAgICAgICBp cyBub3QgY3JlYXRlZCBvbiBXZWJQcm9jZXNzIHNpZGUgdW50aWwgaW5pdGlhbGl6ZVdlYlBhZ2Uo KSBpcyBjYWxsZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW06 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpXZWJWaWV3SW1wbCk6CisKIDIwMTgtMDct MjUgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgRml4 IHRoZSBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl YlZpZXdJbXBsLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwu bW0KaW5kZXggZGI2ZDUyMzQyM2FiOTgxYjJjNzQwMDNmNWE1OTZhNTE0MmE0ZDQzYi4uODVhY2Yy MDU1YTVjYWU4MGM2Y2Q1NTgyNjI1Mjg0ZjQ3NGJjYTVmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KQEAgLTEzMTIsOSArMTMxMiw4IEBAIFdlYlZp ZXdJbXBsOjpXZWJWaWV3SW1wbChOU1ZpZXcgPFdlYlZpZXdJbXBsRGVsZWdhdGU+ICp2aWV3LCBX S1dlYlZpZXcgKm91dGVyV2ViCiAKICAgICBtX3BhZ2UtPnNldEFkZHNWaXNpdGVkTGlua3MocHJv Y2Vzc1Bvb2wuaGlzdG9yeUNsaWVudCgpLmFkZHNWaXNpdGVkTGlua3MoKSk7CiAKLSAgICBtX3Bh Z2UtPnNldFVzZURhcmtBcHBlYXJhbmNlKGVmZmVjdGl2ZUFwcGVhcmFuY2VJc0RhcmsoKSk7Ci0K ICAgICBtX3BhZ2UtPmluaXRpYWxpemVXZWJQYWdlKCk7CisgICAgbV9wYWdlLT5zZXRVc2VEYXJr QXBwZWFyYW5jZShlZmZlY3RpdmVBcHBlYXJhbmNlSXNEYXJrKCkpOwogCiAgICAgcmVnaXN0ZXJE cmFnZ2VkVHlwZXMoKTsKIAo= 345857 2018-07-26 11:51:42 -0700 2018-07-26 12:49:16 -0700 Patch bug-188028-20180726115141.patch text/plain 9123 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZmOWFlMDk5NTI2YjlmYjJk ZDc3NDMxZDg2YmM5MjU3MzM1NzY4MWMuLjA0YTVhM2ZjNTlhNDY5ZjkzYjlkMGNlYWY3Y2M5Y2E0 MmRlY2VmNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTgtMDctMjYgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBFUlJPUjogVW5oYW5kbGVkIHdlYiBw cm9jZXNzIG1lc3NhZ2UgJ1dlYlBhZ2U6U2V0VXNlRGFya0FwcGVhcmFuY2UnIHdoZW4gYnJvd3Np bmcgaW4gZGFyayBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODgwMjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGUgaXNzdWUgd2FzIHRoYXQgdGhlIFdlYlZpZXdJbXBsIGNvbnN0cnVjdG9yIHdh cyBjYWxsaW5nIHNldFVzZURhcmtBcHBlYXJhbmNlKCkgKmJlZm9yZSogY2FsbGluZworICAgICAg ICBpbml0aWFsaXplV2ViUGFnZSgpLCB3aGljaCB3b3VsZCBjYXVzZSB1cyB0byBzZW5kIElQQyB0 aGUgV2ViQ29udGVudCBwcm9jZXNzIGZvciBhIHBhZ2VJRCB0aGF0IGRvZXMKKyAgICAgICAgbm90 IGV4aXN0IG9uIFdlYlByb2Nlc3Mgc2lkZSB5ZXQuCisKKyAgICAgICAgVG8gYWRkcmVzcyB0aGUg aXNzdWUsIHRoZSBXZWJWaWV3SW1wbCBjb25zdHJ1Y3RvciBubyBsb25nZXIgY2FsbHMgc2V0VXNl RGFya0FwcGVhcmFuY2UoKSBhbmQgV2ViUGFnZVByb3h5CisgICAgICAgIG5vIGxvbmdlciBob2xk cyBhIGZsYWcgaW5kaWNhdGVzIGlzIGRhcmsgYXBwZWFyYW5jZSBpcyB1c2VkLiBJbnN0ZWFkLCB0 aGUgV2ViUGFnZVByb3h5IGFza3MgdGhlIFdlYlZpZXcKKyAgICAgICAgZm9yIHRoZSB2YWx1ZSB3 aGVuZXZlciBpdCBuZWVkcyB0bywgdmlhIHRoZSBQYWdlQ2xpZW50LgorCisgICAgICAgICogVUlQ cm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dl YlZpZXdJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwp OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZWZmZWN0aXZlQXBwZWFyYW5jZURpZENo YW5nZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZXRVc2VEYXJrQXBwZWFyYW5j ZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpjcmVhdGlvblBhcmFtZXRlcnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnVzZURhcmtBcHBlYXJhbmNlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjplZmZlY3RpdmVBcHBlYXJhbmNlRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpzaG93UGxheWJhY2tUYXJnZXRQaWNrZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OnNldFVzZURhcmtBcHBlYXJhbmNlKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6dXNl RGFya0FwcGVhcmFuY2UgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMv UGFnZUNsaWVudEltcGxNYWMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJ bXBsTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6ZWZmZWN0aXZlQXBw ZWFyYW5jZUlzRGFyayBjb25zdCk6CisKIDIwMTgtMDctMjYgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGEgZm9yd2FyZCBwcm90b2NvbCBkZWNsYXJh dGlvbiBvZiAnX1dLV2ViVmlld1ByaW50UHJvdmlkZXInCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQ29jb2EvV2ViVmlld0ltcGwuaAppbmRleCA5OGUyN2ExYzMxZjJkOTNjZDFmMTFkNzNjMjEz ZTA4MjIwZTE3MWJmLi43Mjg5YmZkMmQ0YjlkZDc0NDIwMzllODQyNzYxZDU1YTU4OTFkNWMyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmgKQEAgLTUzOSw4 ICs1MzksNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRVc2VTeXN0ZW1BcHBlYXJhbmNlKGJvb2wp OwogICAgIGJvb2wgdXNlU3lzdGVtQXBwZWFyYW5jZSgpOwogCi0gICAgdm9pZCBzZXRVc2VEYXJr QXBwZWFyYW5jZShib29sKTsKLQogICAgIHZvaWQgZWZmZWN0aXZlQXBwZWFyYW5jZURpZENoYW5n ZSgpOwogICAgIGJvb2wgZWZmZWN0aXZlQXBwZWFyYW5jZUlzRGFyaygpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCmluZGV4IGRiNmQ1MjM0MjNhYjk4 MWIyYzc0MDAzZjVhNTk2YTUxNDJhNGQ0M2IuLmU4ZjBlMWJhZTk5OTYzMzhmZGNmZjA0NGYxMjg0 YzBhMjZmMzI3ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl YlZpZXdJbXBsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJ bXBsLm1tCkBAIC0xMzEyLDggKzEzMTIsNiBAQCBXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwoTlNW aWV3IDxXZWJWaWV3SW1wbERlbGVnYXRlPiAqdmlldywgV0tXZWJWaWV3ICpvdXRlcldlYgogCiAg ICAgbV9wYWdlLT5zZXRBZGRzVmlzaXRlZExpbmtzKHByb2Nlc3NQb29sLmhpc3RvcnlDbGllbnQo KS5hZGRzVmlzaXRlZExpbmtzKCkpOwogCi0gICAgbV9wYWdlLT5zZXRVc2VEYXJrQXBwZWFyYW5j ZShlZmZlY3RpdmVBcHBlYXJhbmNlSXNEYXJrKCkpOwotCiAgICAgbV9wYWdlLT5pbml0aWFsaXpl V2ViUGFnZSgpOwogCiAgICAgcmVnaXN0ZXJEcmFnZ2VkVHlwZXMoKTsKQEAgLTUwMjMsNyArNTAy MSw3IEBAIGJvb2wgV2ViVmlld0ltcGw6OnVzZVN5c3RlbUFwcGVhcmFuY2UoKQogCiB2b2lkIFdl YlZpZXdJbXBsOjplZmZlY3RpdmVBcHBlYXJhbmNlRGlkQ2hhbmdlKCkKIHsKLSAgICBzZXRVc2VE YXJrQXBwZWFyYW5jZShlZmZlY3RpdmVBcHBlYXJhbmNlSXNEYXJrKCkpOworICAgIG1fcGFnZS0+ ZWZmZWN0aXZlQXBwZWFyYW5jZURpZENoYW5nZSgpOwogfQogCiBib29sIFdlYlZpZXdJbXBsOjpl ZmZlY3RpdmVBcHBlYXJhbmNlSXNEYXJrKCkKQEAgLTUwMzYsMTEgKzUwMzQsNiBAQCBib29sIFdl YlZpZXdJbXBsOjplZmZlY3RpdmVBcHBlYXJhbmNlSXNEYXJrKCkKICNlbmRpZgogfQogCi12b2lk IFdlYlZpZXdJbXBsOjpzZXRVc2VEYXJrQXBwZWFyYW5jZShib29sIHVzZURhcmtBcHBlYXJhbmNl KQotewotICAgIG1fcGFnZS0+c2V0VXNlRGFya0FwcGVhcmFuY2UodXNlRGFya0FwcGVhcmFuY2Up OwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAppbmRleCAxYWRkODBmYzg0MDNmZGUxZTEy NzgxNzQ1ZTgzNzFhZjkzOTljNzM3Li44NzdhZGZkMjYzZWM3MzVjOTY4MTI3MDEzZDNlNTVhYTEx MmY5YTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCkBAIC0yNjYsNiArMjY2 LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgTlNXaW5kb3cgKnBsYXRmb3JtV2luZG93KCkgPSAw OwogICAgIHZpcnR1YWwgdm9pZCBzZXRTaG91bGRTdXBwcmVzc0ZpcnN0UmVzcG9uZGVyQ2hhbmdl cyhib29sKSA9IDA7CiAKKyAgICB2aXJ0dWFsIGJvb2wgZWZmZWN0aXZlQXBwZWFyYW5jZUlzRGFy aygpIGNvbnN0ID0gMDsKKwogI2lmIFdLX0FQSV9FTkFCTEVECiAgICAgdmlydHVhbCBOU1ZpZXcg Kmluc3BlY3RvckF0dGFjaG1lbnRWaWV3KCkgPSAwOwogICAgIHZpcnR1YWwgX1dLUmVtb3RlT2Jq ZWN0UmVnaXN0cnkgKnJlbW90ZU9iamVjdFJlZ2lzdHJ5KCkgPSAwOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggODc3NzBmMmRmNzJiNGIzMmRkZTIyNTNhZWY5 OWY1YjQ2NDY2M2Y2ZC4uZjFjYTUzOTFkNmI0NDk5ZTVjNTIyOTZmZGZlNGI3NjkwYzhkN2Q1YSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC02MjQ3LDcgKzYy NDcsNyBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25Q YXJhbWV0ZXJzKCkKICNpZiBQTEFURk9STShNQUMpCiAgICAgcGFyYW1ldGVycy5jb2xvclNwYWNl ID0gbV9wYWdlQ2xpZW50LmNvbG9yU3BhY2UoKTsKICAgICBwYXJhbWV0ZXJzLnVzZVN5c3RlbUFw cGVhcmFuY2UgPSBtX3VzZVN5c3RlbUFwcGVhcmFuY2U7Ci0gICAgcGFyYW1ldGVycy51c2VEYXJr QXBwZWFyYW5jZSA9IG1fdXNlRGFya0FwcGVhcmFuY2U7CisgICAgcGFyYW1ldGVycy51c2VEYXJr QXBwZWFyYW5jZSA9IHVzZURhcmtBcHBlYXJhbmNlKCk7CiAjZW5kaWYKICNpZiBQTEFURk9STShJ T1MpCiAgICAgcGFyYW1ldGVycy5zY3JlZW5TaXplID0gc2NyZWVuU2l6ZSgpOwpAQCAtNjg2Miw2 ICs2ODYyLDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpoYW5kbGVBbHRlcm5hdGl2ZVRleHRVSVJl c3VsdChjb25zdCBTdHJpbmcmIHJlc3VsdCkKICAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpIYW5kbGVBbHRlcm5hdGl2ZVRleHRVSVJlc3VsdChyZXN1bHQpLCBtX3Bh Z2VJRCk7CiB9CiAKK2Jvb2wgV2ViUGFnZVByb3h5Ojp1c2VEYXJrQXBwZWFyYW5jZSgpIGNvbnN0 Cit7CisgICAgcmV0dXJuIG1fcGFnZUNsaWVudC5lZmZlY3RpdmVBcHBlYXJhbmNlSXNEYXJrKCk7 Cit9CisKICNpZiBVU0UoRElDVEFUSU9OX0FMVEVSTkFUSVZFUykKIHZvaWQgV2ViUGFnZVByb3h5 OjpzaG93RGljdGF0aW9uQWx0ZXJuYXRpdmVVSShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGJv dW5kaW5nQm94T2ZEaWN0YXRlZFRleHQsIHVpbnQ2NF90IGRpY3RhdGlvbkNvbnRleHQpCiB7CkBA IC03MzcxLDE2ICs3Mzc2LDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRVc2VTeXN0ZW1BcHBl YXJhbmNlKGJvb2wgdXNlU3lzdGVtQXBwZWFyYW5jZSkKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OlNldFVzZVN5c3RlbUFwcGVhcmFuY2UodXNlU3lzdGVtQXBwZWFyYW5j ZSksIG1fcGFnZUlEKTsKIH0KICAgICAKLXZvaWQgV2ViUGFnZVByb3h5OjpzZXRVc2VEYXJrQXBw ZWFyYW5jZShib29sIHVzZURhcmtBcHBlYXJhbmNlKQordm9pZCBXZWJQYWdlUHJveHk6OmVmZmVj dGl2ZUFwcGVhcmFuY2VEaWRDaGFuZ2UoKQogewogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBpZiAodXNlRGFya0FwcGVhcmFuY2UgPT0gbV91c2VEYXJrQXBwZWFy YW5jZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV91c2VEYXJrQXBwZWFyYW5jZSA9IHVzZURh cmtBcHBlYXJhbmNlOwotICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0 VXNlRGFya0FwcGVhcmFuY2UodXNlRGFya0FwcGVhcmFuY2UpLCBtX3BhZ2VJRCk7CisgICAgbV9w cm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRVc2VEYXJrQXBwZWFyYW5jZSh1c2VE YXJrQXBwZWFyYW5jZSgpKSwgbV9wYWdlSUQpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0 SGVhZGVyQmFubmVySGVpZ2h0Rm9yVGVzdGluZyhpbnQgaGVpZ2h0KQpAQCAtNzQyOCw3ICs3NDI5 LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlbW92ZVBsYXliYWNrVGFyZ2V0UGlja2VyQ2xpZW50 KHVpbnQ2NF90IGNvbnRleHRJZCkKIAogdm9pZCBXZWJQYWdlUHJveHk6OnNob3dQbGF5YmFja1Rh cmdldFBpY2tlcih1aW50NjRfdCBjb250ZXh0SWQsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYg cmVjdCwgYm9vbCBoYXNWaWRlbykKIHsKLSAgICBtX3BhZ2VDbGllbnQubWVkaWFTZXNzaW9uTWFu YWdlcigpLnNob3dQbGF5YmFja1RhcmdldFBpY2tlcigqdGhpcywgY29udGV4dElkLCBtX3BhZ2VD bGllbnQucm9vdFZpZXdUb1NjcmVlbihJbnRSZWN0KHJlY3QpKSwgaGFzVmlkZW8sIG1fdXNlRGFy a0FwcGVhcmFuY2UpOworICAgIG1fcGFnZUNsaWVudC5tZWRpYVNlc3Npb25NYW5hZ2VyKCkuc2hv d1BsYXliYWNrVGFyZ2V0UGlja2VyKCp0aGlzLCBjb250ZXh0SWQsIG1fcGFnZUNsaWVudC5yb290 Vmlld1RvU2NyZWVuKEludFJlY3QocmVjdCkpLCBoYXNWaWRlbywgdXNlRGFya0FwcGVhcmFuY2Uo KSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpwbGF5YmFja1RhcmdldFBpY2tlckNsaWVudFN0 YXRlRGlkQ2hhbmdlKHVpbnQ2NF90IGNvbnRleHRJZCwgV2ViQ29yZTo6TWVkaWFQcm9kdWNlcjo6 TWVkaWFTdGF0ZUZsYWdzIHN0YXRlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aAppbmRleCAxODY1MjJkMmYzOTExNGIyZjczMDRhMTU5YjczZWY5ODg5MGQ3ODEzLi4wZDJiZGRj Y2NlMmRhNjE4OGI5NjA1YjljNDY2YTgxMDc1OTBiOWI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaApAQCAtODM2LDggKzgzNiw4IEBAIHB1YmxpYzoKICNpZiBQTEFURk9S TShNQUMpCiAgICAgdm9pZCBzZXRVc2VTeXN0ZW1BcHBlYXJhbmNlKGJvb2wpOwogICAgIGJvb2wg dXNlU3lzdGVtQXBwZWFyYW5jZSgpIGNvbnN0IHsgcmV0dXJuIG1fdXNlU3lzdGVtQXBwZWFyYW5j ZTsgfQotICAgIHZvaWQgc2V0VXNlRGFya0FwcGVhcmFuY2UoYm9vbCk7Ci0gICAgYm9vbCB1c2VE YXJrQXBwZWFyYW5jZSgpIGNvbnN0IHsgcmV0dXJuIG1fdXNlRGFya0FwcGVhcmFuY2U7IH0KKyAg ICB2b2lkIGVmZmVjdGl2ZUFwcGVhcmFuY2VEaWRDaGFuZ2UoKTsKKyAgICBib29sIHVzZURhcmtB cHBlYXJhbmNlKCkgY29uc3Q7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKENPQ09BKQpAQCAtMTg5 MSw3ICsxODkxLDYgQEAgcHJpdmF0ZToKICAgICAgICAgCiAjaWYgUExBVEZPUk0oTUFDKQogICAg IGJvb2wgbV91c2VTeXN0ZW1BcHBlYXJhbmNlIHsgZmFsc2UgfTsKLSAgICBib29sIG1fdXNlRGFy a0FwcGVhcmFuY2UgeyBmYWxzZSB9OwogI2VuZGlmCiAKICNpZiBFTkFCTEUoQVBQTEVfUEFZKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsTWFj LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGxNYWMuaAppbmRl eCBmZDk5OGJlNDlkYzM0MTY5MjZkZjBkYTUyMjY4MzU1ODI5M2JiNzExLi4wNjZmYTkxMjJmZjQ4 YjQ3OGE0OTJhNzUwOWU3ZWQxYjYzMzk5Njk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGxNYWMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9tYWMvUGFnZUNsaWVudEltcGxNYWMuaApAQCAtMjMxLDYgKzIzMSw3IEBAIHByaXZhdGU6 CiAgICAgTlNXaW5kb3cgKnBsYXRmb3JtV2luZG93KCkgb3ZlcnJpZGU7CiAKICAgICBXZWJDb3Jl OjpVc2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uIHVzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rp b24oKSBvdmVycmlkZTsKKyAgICBib29sIGVmZmVjdGl2ZUFwcGVhcmFuY2VJc0RhcmsoKSBjb25z dCBvdmVycmlkZTsKIAogI2lmIFdLX0FQSV9FTkFCTEVECiAgICAgTlNWaWV3ICppbnNwZWN0b3JB dHRhY2htZW50VmlldygpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsTWFjLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv bWFjL1BhZ2VDbGllbnRJbXBsTWFjLm1tCmluZGV4IGY2ZmMyNWIwZjA4ZTI5ZGVkZTc5OTJkMzU2 M2VhZGZhODY5ZDBhZWQuLjYyYzIzOWVkMWQ2YmRiNzBlOWVhMmJhMzEyNDk1ZWI0ZjU5N2MyNzEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbE1h Yy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGxNYWMu bW0KQEAgLTg5NCw2ICs4OTQsMTEgQEAgV2ViQ29yZTo6VXNlckludGVyZmFjZUxheW91dERpcmVj dGlvbiBQYWdlQ2xpZW50SW1wbDo6dXNlckludGVyZmFjZUxheW91dERpcmVjdGkKICAgICByZXR1 cm4gKG1fdmlldy51c2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uID09IE5TVXNlckludGVyZmFj ZUxheW91dERpcmVjdGlvbkxlZnRUb1JpZ2h0KSA/IFdlYkNvcmU6OlVzZXJJbnRlcmZhY2VMYXlv dXREaXJlY3Rpb246OkxUUiA6IFdlYkNvcmU6OlVzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb246 OlJUTDsKIH0KIAorYm9vbCBQYWdlQ2xpZW50SW1wbDo6ZWZmZWN0aXZlQXBwZWFyYW5jZUlzRGFy aygpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1faW1wbC0+ZWZmZWN0aXZlQXBwZWFyYW5jZUlzRGFy aygpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1B QykK