183690 2018-03-15 20:07:59 -0700 Ensure that style is updated when the effective appearance changes 2018-03-16 11:48:40 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner bdakin thorton wenson_hsieh oldest_to_newest 1406926 0 megan_gardner 2018-03-15 20:07:59 -0700 Ensure that style is updated when the effective apperance changes 1406927 1 megan_gardner 2018-03-15 20:12:17 -0700 <rdar://problem/38385900> 1406930 2 335922 megan_gardner 2018-03-15 20:18:17 -0700 Created attachment 335922 Patch 1407041 3 335922 wenson_hsieh 2018-03-16 10:32:31 -0700 Comment on attachment 335922 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=335922&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:6188 > + _page->updateForAppearanceChange(); Instead of propagating another IPC message, could we just setNeedsRecalcStyleInAllFrames() after setting the default appearance in the web process? 1407042 4 335922 thorton 2018-03-16 10:34:49 -0700 Comment on attachment 335922 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=335922&action=review > Source/WebCore/ChangeLog:9 > + Only exposing a function to outside webcore, no tests needed. WebCore >> Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:6188 >> + _page->updateForAppearanceChange(); > > Instead of propagating another IPC message, could we just setNeedsRecalcStyleInAllFrames() after setting the default appearance in the web process? Agree! Tinier patch. > Source/WebKitLegacy/mac/WebView/WebView.mm:5216 > +#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 Not really necessary. > Source/WebKitLegacy/mac/WebView/WebView.mm:5219 > + if (auto page = _private->page) { Early return instead of this. 1407053 5 335953 megan_gardner 2018-03-16 11:18:11 -0700 Created attachment 335953 Patch 1407055 6 335953 thorton 2018-03-16 11:28:52 -0700 Comment on attachment 335953 Patch Plz address previous comments. 1407063 7 megan_gardner 2018-03-16 11:48:40 -0700 https://trac.webkit.org/changeset/229679/webkit 335922 2018-03-15 20:18:17 -0700 2018-03-16 11:18:10 -0700 Patch bug-183690-20180315201816.patch text/plain 7773 megan_gardner SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyOTY1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE4LTAzLTE1ICBNZWdhbiBH YXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRW5zdXJlIHRoYXQg c3R5bGUgaXMgdXBkYXRlZCB3aGVuIHRoZSBlZmZlY3RpdmUgYXBwZWFyYW5jZSBjaGFuZ2VzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODM2OTAKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM4Mzg1OTAwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE9ubHkgZXhwb3NpbmcgYSBmdW5jdGlvbiB0byBvdXRz aWRlIHdlYmNvcmUsIG5vIHRlc3RzIG5lZWRlZC4KKworICAgICAgICAqIHBhZ2UvUGFnZS5oOgor CiAyMDE4LTAzLTE1ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CiAK ICAgICAgICAgQ3JlYXRlIE1lZGlhUXVlcnlQYXJzZXJDb250ZXh0IHRvIHByb3ZpZGUgYWRkaXRp b25hbCBjb250ZXh0IGZvciB0aGUgZXZhbHVhdGlvbiBvZiBtZWRpYSBxdWVyaWVzCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2UuaAkocmV2aXNpb24gMjI5NjUzKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl LmgJKHdvcmtpbmcgY29weSkKQEAgLTE2MCw3ICsxNjAsNyBAQCBwdWJsaWM6CiAKICAgICBXRUJD T1JFX0VYUE9SVCB1aW50NjRfdCByZW5kZXJUcmVlU2l6ZSgpIGNvbnN0OwogCi0gICAgdm9pZCBz ZXROZWVkc1JlY2FsY1N0eWxlSW5BbGxGcmFtZXMoKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lk IHNldE5lZWRzUmVjYWxjU3R5bGVJbkFsbEZyYW1lcygpOwogCiAgICAgV0VCQ09SRV9FWFBPUlQg Vmlld3BvcnRBcmd1bWVudHMgdmlld3BvcnRBcmd1bWVudHMoKSBjb25zdDsKIApJbmRleDogU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VM b2cJKHJldmlzaW9uIDIyOTY1NykKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTgtMDMtMTUgIE1lZ2FuIEdhcmRuZXIgIDxtZWdh bl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBFbnN1cmUgdGhhdCBzdHlsZSBpcyB1cGRh dGVkIHdoZW4gdGhlIGVmZmVjdGl2ZSBhcHBlYXJhbmNlIGNoYW5nZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzY5MAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMzgzODU5MDA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmVzcG9uZCB0byBhbmQgcmVzcGVjdCB0aGUgZWZmZWN0aXZlIGFwcGVhcmFu Y2UgY2hhbmdpbmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bToKKyAgICAgICAgKC1bV0tXZWJWaWV3IGVmZmVjdGl2ZUFwcGVhcmFuY2VEaWRDaGFuZ2VdKToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5Ojp1cGRhdGVGb3JBcHBlYXJhbmNlQ2hhbmdlKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVGb3JBcHBlYXJhbmNlQ2hh bmdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorCiAyMDE4LTAzLTE1ICBL ZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBUZWxlbWV0cnkgZm9y IHN0YWxsZWQgd2VicGFnZSBsb2FkcwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCShyZXZpc2lvbiAyMjk2NTMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OTg2LDYgKzY5ODYsMTEgQEAg dm9pZCBXZWJQYWdlUHJveHk6OnNldERlZmF1bHRBcHBlYXJhbmNlKAogICAgIG1fZGVmYXVsdEFw cGVhcmFuY2UgPSBkZWZhdWx0QXBwZWFyYW5jZTsKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2U6OlNldERlZmF1bHRBcHBlYXJhbmNlKGRlZmF1bHRBcHBlYXJhbmNlKSwgbV9w YWdlSUQpOwogfQorICAgIAordm9pZCBXZWJQYWdlUHJveHk6OnVwZGF0ZUZvckFwcGVhcmFuY2VD aGFuZ2UoKQoreworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VXBkYXRl Rm9yQXBwZWFyYW5jZUNoYW5nZSgpLCBtX3BhZ2VJRCk7Cit9CiAKIHZvaWQgV2ViUGFnZVByb3h5 OjpzZXRIZWFkZXJCYW5uZXJIZWlnaHRGb3JUZXN0aW5nKGludCBoZWlnaHQpCiB7CkluZGV4OiBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMjI5NjUzKQorKysg U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAg LTgwOCw2ICs4MDgsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCB1c2VTeXN0ZW1BcHBlYXJhbmNlKCkg Y29uc3QgeyByZXR1cm4gbV91c2VTeXN0ZW1BcHBlYXJhbmNlOyB9CiAgICAgdm9pZCBzZXREZWZh dWx0QXBwZWFyYW5jZShib29sKTsKICAgICBib29sIGRlZmF1bHRBcHBlYXJhbmNlKCkgY29uc3Qg eyByZXR1cm4gbV9kZWZhdWx0QXBwZWFyYW5jZTsgfQorICAgIHZvaWQgdXBkYXRlRm9yQXBwZWFy YW5jZUNoYW5nZSgpOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShDT0NPQSkKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQkocmV2aXNpb24g MjI5NjUzKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bQkod29ya2luZyBjb3B5KQpAQCAtNjE4MSw2ICs2MTgxLDE0IEBAIC0gKHZvaWQpX3NldFVzZVN5 c3RlbUFwcGVhcmFuY2U6KEJPT0wpdXMKICAgICBfcGFnZS0+c2V0RGVmYXVsdEFwcGVhcmFuY2Uo W3NlbGYgX2RlZmF1bHRBcHBlYXJhbmNlXSk7CiB9CiAKKyNpZiBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEwMTQwMAorLSAodm9pZCllZmZlY3RpdmVBcHBlYXJhbmNlRGlkQ2hh bmdlCit7CisgICAgX3BhZ2UtPnNldERlZmF1bHRBcHBlYXJhbmNlKFtzZWxmIF9kZWZhdWx0QXBw ZWFyYW5jZV0pOworICAgIF9wYWdlLT51cGRhdGVGb3JBcHBlYXJhbmNlQ2hhbmdlKCk7Cit9Cisj ZW5kaWYKKwogLSAodm9pZClfc2V0SGVhZGVyQmFubmVySGVpZ2h0OihpbnQpaGVpZ2h0CiB7CiAg ICAgX3BhZ2UtPnNldEhlYWRlckJhbm5lckhlaWdodEZvclRlc3RpbmcoaGVpZ2h0KTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lv biAyMjk2NTMpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNDEzMSw2ICs0MTMxLDExIEBAIHZvaWQgV2ViUGFnZTo6c2V0 RGVmYXVsdEFwcGVhcmFuY2UoYm9vbCAKIHsKICAgICBjb3JlUGFnZSgpLT5zZXREZWZhdWx0QXBw ZWFyYW5jZShkZWZhdWx0QXBwZWFyYW5jZSk7CiB9CisKK3ZvaWQgV2ViUGFnZTo6dXBkYXRlRm9y QXBwZWFyYW5jZUNoYW5nZSgpCit7CisgICAgY29yZVBhZ2UoKS0+c2V0TmVlZHNSZWNhbGNTdHls ZUluQWxsRnJhbWVzKCk7Cit9CiAjZW5kaWYKIAogdm9pZCBXZWJQYWdlOjpiZWdpblByaW50aW5n KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFByaW50SW5mbyYgcHJpbnRJbmZvKQpJbmRleDogU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkocmV2aXNpb24gMjI5NjUz KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCSh3b3JraW5n IGNvcHkpCkBAIC00OTEsNiArNDkxLDggQEAgcHVibGljOgogICAgIAogICAgIHZvaWQgc2V0VXNl U3lzdGVtQXBwZWFyYW5jZShib29sKTsKICAgICB2b2lkIHNldERlZmF1bHRBcHBlYXJhbmNlKGJv b2wpOworICAgIHZvaWQgdXBkYXRlRm9yQXBwZWFyYW5jZUNoYW5nZSgpOworCiAjZW5kaWYKIAog ICAgIGJvb2wgd2luZG93SXNGb2N1c2VkKCkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlzaW9u IDIyOTY1MykKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVz c2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTQ0Miw4ICs0NDIsOSBAQCBtZXNzYWdlcyAtPiBX ZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKIAogICAgIEhhbmRsZUFjY2VwdGVkQ2FuZGlkYXRlKHN0 cnVjdCBXZWJDb3JlOjpUZXh0Q2hlY2tpbmdSZXN1bHQgYWNjZXB0ZWRDYW5kaWRhdGUpCiAKLSAg ICBTZXRVc2VTeXN0ZW1BcHBlYXJhbmNlKGJvb2wgdXNlU3lzdGVtQXBwZWFyYW5jZSk7Ci0gICAg U2V0RGVmYXVsdEFwcGVhcmFuY2UoYm9vbCBkZWZhdWx0QXBwZWFyYW5jZSk7CisgICAgU2V0VXNl U3lzdGVtQXBwZWFyYW5jZShib29sIHVzZVN5c3RlbUFwcGVhcmFuY2UpCisgICAgU2V0RGVmYXVs dEFwcGVhcmFuY2UoYm9vbCBkZWZhdWx0QXBwZWFyYW5jZSkKKyAgICBVcGRhdGVGb3JBcHBlYXJh bmNlQ2hhbmdlKCkKIAogICAgIFNldEhlYWRlckJhbm5lckhlaWdodEZvclRlc3RpbmcoaW50IGhl aWdodCk7CiAgICAgU2V0Rm9vdGVyQmFubmVySGVpZ2h0Rm9yVGVzdGluZyhpbnQgaGVpZ2h0KTsK SW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyOTY1NCkKKysrIFNv dXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE3IEBACisyMDE4LTAzLTE1ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5j b20+CisKKyAgICAgICAgRW5zdXJlIHRoYXQgc3R5bGUgaXMgdXBkYXRlZCB3aGVuIHRoZSBlZmZl Y3RpdmUgYXBwZWFyYW5jZSBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODM2OTAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM4Mzg1OTAw PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlc3Bv bmQgdG8gYW5kIHJlc3BlY3QgdGhlIGVmZmVjdGl2ZSBhcHBlYXJhbmNlIGNoYW5naW5nLgorCisg ICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9zZXRVc2VT eXN0ZW1BcHBlYXJhbmNlOl0pOgorICAgICAgICAoLVtXZWJWaWV3IGVmZmVjdGl2ZUFwcGVhcmFu Y2VEaWRDaGFuZ2VdKToKKwogMjAxOC0wMy0xNSAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRu ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENyZWF0ZSBNZWRpYVF1ZXJ5UGFyc2VyQ29udGV4dCB0 byBwcm92aWRlIGFkZGl0aW9uYWwgY29udGV4dCBmb3IgdGhlIGV2YWx1YXRpb24gb2YgbWVkaWEg cXVlcmllcwpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5t bQkocmV2aXNpb24gMjI5NjUzKQorKysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9X ZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC01MjAyLDYgKzUyMDIsNyBAQCAtICh2b2lkKV9z ZXRVc2VTeXN0ZW1BcHBlYXJhbmNlOihCT09MKXVzCiAgICAgaWYgKGF1dG8gcGFnZSA9IF9wcml2 YXRlLT5wYWdlKSB7CiAgICAgICAgIHBhZ2UtPnNldFVzZVN5c3RlbUFwcGVhcmFuY2UodXNlU3lz dGVtQXBwZWFyYW5jZSk7CiAgICAgICAgIHBhZ2UtPnNldERlZmF1bHRBcHBlYXJhbmNlKFtzZWxm IF9kZWZhdWx0QXBwZWFyYW5jZV0pOworICAgICAgICBwYWdlLT5zZXROZWVkc1JlY2FsY1N0eWxl SW5BbGxGcmFtZXMoKTsKICAgICB9CiB9CiAKQEAgLTUyMTIsNiArNTIxMywxNiBAQCAtIChCT09M KV91c2VTeXN0ZW1BcHBlYXJhbmNlCiAgICAgcmV0dXJuIE5POwogfQogCisjaWYgUExBVEZPUk0o TUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTQwMAorLSAodm9p ZCllZmZlY3RpdmVBcHBlYXJhbmNlRGlkQ2hhbmdlCit7CisgICAgaWYgKGF1dG8gcGFnZSA9IF9w cml2YXRlLT5wYWdlKSB7CisgICAgICAgIHBhZ2UtPnNldERlZmF1bHRBcHBlYXJhbmNlKFtzZWxm IF9kZWZhdWx0QXBwZWFyYW5jZV0pOworICAgICAgICBwYWdlLT5zZXROZWVkc1JlY2FsY1N0eWxl SW5BbGxGcmFtZXMoKTsKKyAgICB9Cit9CisjZW5kaWYKKwogLSAodm9pZClfc2V0U291cmNlQXBw bGljYXRpb25BdWRpdERhdGE6KE5TRGF0YSAqKXNvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhCiB7 CiAgICAgaWYgKF9wcml2YXRlLT5zb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSA9PSBzb3VyY2VB cHBsaWNhdGlvbkF1ZGl0RGF0YSkK 335953 2018-03-16 11:18:11 -0700 2018-03-16 11:28:52 -0700 Patch bug-183690-20180316111810.patch text/plain 4964 megan_gardner SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyOTY1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE4LTAzLTE2ICBNZWdhbiBH YXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRW5zdXJlIHRoYXQg c3R5bGUgaXMgdXBkYXRlZCB3aGVuIHRoZSBlZmZlY3RpdmUgYXBwZWFyYW5jZSBjaGFuZ2VzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODM2OTAKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM4Mzg1OTAwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE9ubHkgZXhwb3NpbmcgYSBmdW5jdGlvbiB0byBvdXRz aWRlIHdlYmNvcmUsIG5vIHRlc3RzIG5lZWRlZC4KKworICAgICAgICAqIHBhZ2UvUGFnZS5oOgor CiAyMDE4LTAzLTE1ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CiAK ICAgICAgICAgQ3JlYXRlIE1lZGlhUXVlcnlQYXJzZXJDb250ZXh0IHRvIHByb3ZpZGUgYWRkaXRp b25hbCBjb250ZXh0IGZvciB0aGUgZXZhbHVhdGlvbiBvZiBtZWRpYSBxdWVyaWVzCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2UuaAkocmV2aXNpb24gMjI5NjUzKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl LmgJKHdvcmtpbmcgY29weSkKQEAgLTE2MCw3ICsxNjAsNyBAQCBwdWJsaWM6CiAKICAgICBXRUJD T1JFX0VYUE9SVCB1aW50NjRfdCByZW5kZXJUcmVlU2l6ZSgpIGNvbnN0OwogCi0gICAgdm9pZCBz ZXROZWVkc1JlY2FsY1N0eWxlSW5BbGxGcmFtZXMoKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lk IHNldE5lZWRzUmVjYWxjU3R5bGVJbkFsbEZyYW1lcygpOwogCiAgICAgV0VCQ09SRV9FWFBPUlQg Vmlld3BvcnRBcmd1bWVudHMgdmlld3BvcnRBcmd1bWVudHMoKSBjb25zdDsKIApJbmRleDogU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VM b2cJKHJldmlzaW9uIDIyOTY3NCkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTgtMDMtMTYgIE1lZ2FuIEdhcmRuZXIgIDxtZWdh bl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBFbnN1cmUgdGhhdCBzdHlsZSBpcyB1cGRh dGVkIHdoZW4gdGhlIGVmZmVjdGl2ZSBhcHBlYXJhbmNlIGNoYW5nZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzY5MAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMzgzODU5MDA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmVzcG9uZCB0byBhbmQgcmVzcGVjdCB0aGUgZWZmZWN0aXZlIGFwcGVhcmFu Y2UgY2hhbmdpbmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bToKKyAgICAgICAgKC1bV0tXZWJWaWV3IGVmZmVjdGl2ZUFwcGVhcmFuY2VEaWRDaGFuZ2VdKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2U6OnNldERlZmF1bHRBcHBlYXJhbmNlKToKKwogMjAxOC0wMy0xNiAgQ2hyaXMg RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVSTFNjaGVtZUhhbmRsZXIuQmFz aWMgQVBJIHRlc3QgZmFpbHMgd2l0aCBhc3luYyBwb2xpY3kgZGVsZWdhdGVzCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHJldmlzaW9u IDIyOTY1MykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu bW0JKHdvcmtpbmcgY29weSkKQEAgLTYxODEsNiArNjE4MSwxMSBAQCAtICh2b2lkKV9zZXRVc2VT eXN0ZW1BcHBlYXJhbmNlOihCT09MKXVzCiAgICAgX3BhZ2UtPnNldERlZmF1bHRBcHBlYXJhbmNl KFtzZWxmIF9kZWZhdWx0QXBwZWFyYW5jZV0pOwogfQogCistICh2b2lkKWVmZmVjdGl2ZUFwcGVh cmFuY2VEaWRDaGFuZ2UKK3sKKyAgICBfcGFnZS0+c2V0RGVmYXVsdEFwcGVhcmFuY2UoW3NlbGYg X2RlZmF1bHRBcHBlYXJhbmNlXSk7Cit9CisKIC0gKHZvaWQpX3NldEhlYWRlckJhbm5lckhlaWdo dDooaW50KWhlaWdodAogewogICAgIF9wYWdlLT5zZXRIZWFkZXJCYW5uZXJIZWlnaHRGb3JUZXN0 aW5nKGhlaWdodCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAkocmV2aXNpb24gMjI5NjUzKQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxMzAsNiArNDEzMCw3IEBA IHZvaWQgV2ViUGFnZTo6c2V0VXNlU3lzdGVtQXBwZWFyYW5jZShib28KIHZvaWQgV2ViUGFnZTo6 c2V0RGVmYXVsdEFwcGVhcmFuY2UoYm9vbCBkZWZhdWx0QXBwZWFyYW5jZSkKIHsKICAgICBjb3Jl UGFnZSgpLT5zZXREZWZhdWx0QXBwZWFyYW5jZShkZWZhdWx0QXBwZWFyYW5jZSk7CisgICAgY29y ZVBhZ2UoKS0+c2V0TmVlZHNSZWNhbGNTdHlsZUluQWxsRnJhbWVzKCk7CiB9CiAjZW5kaWYKIApJ bmRleDogU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gMjI5NjU0KQorKysgU291 cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTcgQEAKKzIwMTgtMDMtMTYgIE1lZ2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNv bT4KKworICAgICAgICBFbnN1cmUgdGhhdCBzdHlsZSBpcyB1cGRhdGVkIHdoZW4gdGhlIGVmZmVj dGl2ZSBhcHBlYXJhbmNlIGNoYW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4MzY5MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzgzODU5MDA+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVzcG9u ZCB0byBhbmQgcmVzcGVjdCB0aGUgZWZmZWN0aXZlIGFwcGVhcmFuY2UgY2hhbmdpbmcuCisKKyAg ICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX3NldFVzZVN5 c3RlbUFwcGVhcmFuY2U6XSk6CisgICAgICAgICgtW1dlYlZpZXcgZWZmZWN0aXZlQXBwZWFyYW5j ZURpZENoYW5nZV0pOgorCiAyMDE4LTAzLTE1ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5l ckBhcHBsZS5jb20+CiAKICAgICAgICAgQ3JlYXRlIE1lZGlhUXVlcnlQYXJzZXJDb250ZXh0IHRv IHByb3ZpZGUgYWRkaXRpb25hbCBjb250ZXh0IGZvciB0aGUgZXZhbHVhdGlvbiBvZiBtZWRpYSBx dWVyaWVzCkluZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1t CShyZXZpc2lvbiAyMjk2NTMpCisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dl YlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTUyMDIsNiArNTIwMiw3IEBAIC0gKHZvaWQpX3Nl dFVzZVN5c3RlbUFwcGVhcmFuY2U6KEJPT0wpdXMKICAgICBpZiAoYXV0byBwYWdlID0gX3ByaXZh dGUtPnBhZ2UpIHsKICAgICAgICAgcGFnZS0+c2V0VXNlU3lzdGVtQXBwZWFyYW5jZSh1c2VTeXN0 ZW1BcHBlYXJhbmNlKTsKICAgICAgICAgcGFnZS0+c2V0RGVmYXVsdEFwcGVhcmFuY2UoW3NlbGYg X2RlZmF1bHRBcHBlYXJhbmNlXSk7CisgICAgICAgIHBhZ2UtPnNldE5lZWRzUmVjYWxjU3R5bGVJ bkFsbEZyYW1lcygpOwogICAgIH0KIH0KIApAQCAtNTIxMiw2ICs1MjEzLDE0IEBAIC0gKEJPT0wp X3VzZVN5c3RlbUFwcGVhcmFuY2UKICAgICByZXR1cm4gTk87CiB9CiAKKy0gKHZvaWQpZWZmZWN0 aXZlQXBwZWFyYW5jZURpZENoYW5nZQoreworICAgIGlmIChhdXRvIHBhZ2UgPSBfcHJpdmF0ZS0+ cGFnZSkgeworICAgICAgICBwYWdlLT5zZXREZWZhdWx0QXBwZWFyYW5jZShbc2VsZiBfZGVmYXVs dEFwcGVhcmFuY2VdKTsKKyAgICAgICAgcGFnZS0+c2V0TmVlZHNSZWNhbGNTdHlsZUluQWxsRnJh bWVzKCk7CisgICAgfQorfQorCiAtICh2b2lkKV9zZXRTb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0 YTooTlNEYXRhICopc291cmNlQXBwbGljYXRpb25BdWRpdERhdGEKIHsKICAgICBpZiAoX3ByaXZh dGUtPnNvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhID09IHNvdXJjZUFwcGxpY2F0aW9uQXVkaXRE YXRhKQo=