172840 2017-06-01 16:41:22 -0700 Resource Load Statistics: Skip plugin data in grandfathering to avoid text diff test failures 2017-08-14 10:09:08 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED WONTFIX https://bugs.webkit.org/show_bug.cgi?id=174652 https://bugs.webkit.org/show_bug.cgi?id=174720 InRadar P2 Normal --- 1 wilander wilander dbates jbedard webkit-bug-importer wilander oldest_to_newest 1314883 0 wilander 2017-06-01 16:41:22 -0700 Plugins occasionally cause text diff layout test failures (<rdar://problem/30493994>). Grandfathering on fresh starts makes that happen a lot more often which is hurting developers who don't want to uninstall their plugins. Therefore we should skip plugin data in grandfathering for the time being. 1314884 1 webkit-bug-importer 2017-06-01 16:41:57 -0700 <rdar://problem/32524816> 1314885 2 311778 wilander 2017-06-01 16:44:28 -0700 Created attachment 311778 Patch 1314886 3 311779 wilander 2017-06-01 16:51:08 -0700 Created attachment 311779 Patch 1314890 4 311781 wilander 2017-06-01 16:54:58 -0700 Created attachment 311781 Patch 1315155 5 wilander 2017-06-02 12:12:30 -0700 Turns out this change doesn’t seem to fix the issue. It may be we have to turn off grandfathering by default in tests instead. 1330384 6 315928 jbedard 2017-07-19 10:03:35 -0700 Created attachment 315928 Patch 1330385 7 jbedard 2017-07-19 10:05:56 -0700 (In reply to Jonathan Bedard from comment #6) > Created attachment 315928 [details] > Patch This patch will 'fix' the issue, but I don't think this is addressing the root cause. I think https://bugs.webkit.org/show_bug.cgi?id=174652 is the root cause. 1331032 8 jbedard 2017-07-21 11:07:25 -0700 This just looks to be a testing harness issue. I've filed https://bugs.webkit.org/show_bug.cgi?id=174720 with the fix in the WebKitTestRunner. 311778 2017-06-01 16:44:28 -0700 2017-06-01 16:51:06 -0700 Patch bug-172840-20170601164420.patch text/plain 2522 wilander SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNzY4OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA2LTAxICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlIExvYWQgU3Rh dGlzdGljczogU2tpcCBwbHVnaW4gZGF0YSBpbiBncmFuZGZhdGhlcmluZyB0byBhdm9pZCB0ZXh0 IGRpZmYgdGVzdCBmYWlsdXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyODQwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjUyNDgxNj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW5kZmF0aGVyRXhpc3RpbmdXZWJzaXRl RGF0YSk6CisKIDIwMTctMDYtMDEgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgogCiAgICAg ICAgIFJlbmFtZSBhbiBleHBlcmltZW50YWwgZmVhdHVyZSBpdGVtCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmNwcAkocmV2aXNpb24gMjE3NjMwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIx MCwxMiArMjEwLDE3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZWcK IAogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW5kZmF0aGVyRXhpc3Rp bmdXZWJzaXRlRGF0YSgpCiB7Ci0gICAgaWYgKGRhdGFUeXBlc1RvUmVtb3ZlLmlzRW1wdHkoKSkK LSAgICAgICAgaW5pdGlhbGl6ZURhdGFUeXBlc1RvUmVtb3ZlKCk7CisgICAgLy8gRklYTUU6IFdl IHNob3VsZCBpbmNsdWRlIHBsdWdpbiBkYXRhIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzMwNDkzOTk0 PiBpcyByZXNvbHZlZC4KKyAgICBzdGF0aWMgT3B0aW9uU2V0PFdlYktpdDo6V2Vic2l0ZURhdGFU eXBlPiBkYXRhVHlwZXNUb0dyYW5kZmF0aGVyOworICAgIGlmIChkYXRhVHlwZXNUb0dyYW5kZmF0 aGVyLmlzRW1wdHkoKSkgeworICAgICAgICBpZiAoZGF0YVR5cGVzVG9SZW1vdmUuaXNFbXB0eSgp KQorICAgICAgICAgICAgaW5pdGlhbGl6ZURhdGFUeXBlc1RvUmVtb3ZlKCk7CisgICAgICAgIGRh dGFUeXBlc1RvR3JhbmRmYXRoZXIgPSBkYXRhVHlwZXNUb1JlbW92ZSAtPSBXZWJzaXRlRGF0YVR5 cGU6OlBsdWdJbkRhdGE7CisgICAgfQogICAgIAogICAgIC8vIFN3aXRjaCB0byB0aGUgbWFpbiB0 aHJlYWQgdG8gZ2V0IHRoZSBkZWZhdWx0IHdlYnNpdGUgZGF0YSBzdG9yZQogICAgIFJ1bkxvb3A6 Om1haW4oKS5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSAo KSBtdXRhYmxlIHsKLSAgICAgICAgV2ViUHJvY2Vzc1Byb3h5Ojp0b3BQcml2YXRlbHlDb250cm9s bGVkRG9tYWluc1dpdGhXZWJpdGVEYXRhKGRhdGFUeXBlc1RvUmVtb3ZlLCBub3RpZnlQYWdlcywg W3RoaXNdKEhhc2hTZXQ8U3RyaW5nPiYmIHRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zV2l0 aFdlYnNpdGVEYXRhKSBtdXRhYmxlIHsKKyAgICAgICAgV2ViUHJvY2Vzc1Byb3h5Ojp0b3BQcml2 YXRlbHlDb250cm9sbGVkRG9tYWluc1dpdGhXZWJpdGVEYXRhKGRhdGFUeXBlc1RvR3JhbmRmYXRo ZXIsIG5vdGlmeVBhZ2VzLCBbdGhpc10oSGFzaFNldDxTdHJpbmc+JiYgdG9wUHJpdmF0ZWx5Q29u dHJvbGxlZERvbWFpbnNXaXRoV2Vic2l0ZURhdGEpIG11dGFibGUgewogICAgICAgICAgICAgLy8g QnV0IGFsd2F5cyB0b3VjaCB0aGUgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyBzdG9yZSBvbiB0aGUg d29ya2VyIHF1ZXVlCiAgICAgICAgICAgICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0Y2goW3Ro aXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgdG9wRG9tYWlucyA9IENyb3NzVGhy ZWFkQ29waWVyPEhhc2hTZXQ8U3RyaW5nPj46OmNvcHkodG9wUHJpdmF0ZWx5Q29udHJvbGxlZERv bWFpbnNXaXRoV2Vic2l0ZURhdGEpXSAoKSBtdXRhYmxlIHsKICAgICAgICAgICAgICAgICB0aGlz LT5jb3JlU3RvcmUoKS5oYW5kbGVGcmVzaFN0YXJ0V2l0aEVtcHR5T3JOb1N0b3JlKFdURk1vdmUo dG9wRG9tYWlucykpOwo= 311779 2017-06-01 16:51:08 -0700 2017-06-01 16:54:57 -0700 Patch bug-172840-20170601165100.patch text/plain 2563 wilander SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNzY4OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA2LTAxICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlIExvYWQgU3Rh dGlzdGljczogU2tpcCBwbHVnaW4gZGF0YSBpbiBncmFuZGZhdGhlcmluZyB0byBhdm9pZCB0ZXh0 IGRpZmYgdGVzdCBmYWlsdXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyODQwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjUyNDgxNj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW5kZmF0aGVyRXhpc3RpbmdXZWJzaXRl RGF0YSk6CisKIDIwMTctMDYtMDEgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgogCiAgICAg ICAgIFJlbmFtZSBhbiBleHBlcmltZW50YWwgZmVhdHVyZSBpdGVtCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmNwcAkocmV2aXNpb24gMjE3NjMwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIx MCwxMiArMjEwLDE5IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZWcK IAogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW5kZmF0aGVyRXhpc3Rp bmdXZWJzaXRlRGF0YSgpCiB7Ci0gICAgaWYgKGRhdGFUeXBlc1RvUmVtb3ZlLmlzRW1wdHkoKSkK LSAgICAgICAgaW5pdGlhbGl6ZURhdGFUeXBlc1RvUmVtb3ZlKCk7CisgICAgLy8gRklYTUU6IFdl IHNob3VsZCBpbmNsdWRlIHBsdWdpbiBkYXRhIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzMwNDkzOTk0 PiBpcyByZXNvbHZlZC4KKyAgICBzdGF0aWMgT3B0aW9uU2V0PFdlYktpdDo6V2Vic2l0ZURhdGFU eXBlPiBkYXRhVHlwZXNUb0dyYW5kZmF0aGVyOworICAgIGlmIChkYXRhVHlwZXNUb0dyYW5kZmF0 aGVyLmlzRW1wdHkoKSkgeworICAgICAgICBpZiAoZGF0YVR5cGVzVG9SZW1vdmUuaXNFbXB0eSgp KQorICAgICAgICAgICAgaW5pdGlhbGl6ZURhdGFUeXBlc1RvUmVtb3ZlKCk7CisjaWYgRU5BQkxF KE5FVFNDQVBFX1BMVUdJTl9BUEkpCisgICAgICAgIGRhdGFUeXBlc1RvR3JhbmRmYXRoZXIgPSBk YXRhVHlwZXNUb1JlbW92ZSAtPSBXZWJzaXRlRGF0YVR5cGU6OlBsdWdJbkRhdGE7CisjZW5kaWYK KyAgICB9CiAgICAgCiAgICAgLy8gU3dpdGNoIHRvIHRoZSBtYWluIHRocmVhZCB0byBnZXQgdGhl IGRlZmF1bHQgd2Vic2l0ZSBkYXRhIHN0b3JlCiAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNo KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldICgpIG11dGFibGUgewotICAg ICAgICBXZWJQcm9jZXNzUHJveHk6OnRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zV2l0aFdl Yml0ZURhdGEoZGF0YVR5cGVzVG9SZW1vdmUsIG5vdGlmeVBhZ2VzLCBbdGhpc10oSGFzaFNldDxT dHJpbmc+JiYgdG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnNXaXRoV2Vic2l0ZURhdGEpIG11 dGFibGUgeworICAgICAgICBXZWJQcm9jZXNzUHJveHk6OnRvcFByaXZhdGVseUNvbnRyb2xsZWRE b21haW5zV2l0aFdlYml0ZURhdGEoZGF0YVR5cGVzVG9HcmFuZGZhdGhlciwgbm90aWZ5UGFnZXMs IFt0aGlzXShIYXNoU2V0PFN0cmluZz4mJiB0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluc1dp dGhXZWJzaXRlRGF0YSkgbXV0YWJsZSB7CiAgICAgICAgICAgICAvLyBCdXQgYWx3YXlzIHRvdWNo IHRoZSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIHN0b3JlIG9uIHRoZSB3b3JrZXIgcXVldWUKICAg ICAgICAgICAgIG1fc3RhdGlzdGljc1F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhp cyA9IG1ha2VSZWYoKnRoaXMpLCB0b3BEb21haW5zID0gQ3Jvc3NUaHJlYWRDb3BpZXI8SGFzaFNl dDxTdHJpbmc+Pjo6Y29weSh0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluc1dpdGhXZWJzaXRl RGF0YSldICgpIG11dGFibGUgewogICAgICAgICAgICAgICAgIHRoaXMtPmNvcmVTdG9yZSgpLmhh bmRsZUZyZXNoU3RhcnRXaXRoRW1wdHlPck5vU3RvcmUoV1RGTW92ZSh0b3BEb21haW5zKSk7Cg== 311781 2017-06-01 16:54:58 -0700 2017-07-19 10:03:34 -0700 Patch bug-172840-20170601165451.patch text/plain 2623 wilander SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNzY4OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA2LTAxICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlIExvYWQgU3Rh dGlzdGljczogU2tpcCBwbHVnaW4gZGF0YSBpbiBncmFuZGZhdGhlcmluZyB0byBhdm9pZCB0ZXh0 IGRpZmYgdGVzdCBmYWlsdXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyODQwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjUyNDgxNj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW5kZmF0aGVyRXhpc3RpbmdXZWJzaXRl RGF0YSk6CisKIDIwMTctMDYtMDEgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgogCiAgICAg ICAgIFJlbmFtZSBhbiBleHBlcmltZW50YWwgZmVhdHVyZSBpdGVtCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmNwcAkocmV2aXNpb24gMjE3NjMwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIx MCwxMiArMjEwLDIxIEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZWcK IAogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW5kZmF0aGVyRXhpc3Rp bmdXZWJzaXRlRGF0YSgpCiB7Ci0gICAgaWYgKGRhdGFUeXBlc1RvUmVtb3ZlLmlzRW1wdHkoKSkK LSAgICAgICAgaW5pdGlhbGl6ZURhdGFUeXBlc1RvUmVtb3ZlKCk7CisgICAgLy8gRklYTUU6IFdl IHNob3VsZCBpbmNsdWRlIHBsdWdpbiBkYXRhIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzMwNDkzOTk0 PiBpcyByZXNvbHZlZC4KKyAgICBzdGF0aWMgT3B0aW9uU2V0PFdlYktpdDo6V2Vic2l0ZURhdGFU eXBlPiBkYXRhVHlwZXNUb0dyYW5kZmF0aGVyOworICAgIGlmIChkYXRhVHlwZXNUb0dyYW5kZmF0 aGVyLmlzRW1wdHkoKSkgeworICAgICAgICBpZiAoZGF0YVR5cGVzVG9SZW1vdmUuaXNFbXB0eSgp KQorICAgICAgICAgICAgaW5pdGlhbGl6ZURhdGFUeXBlc1RvUmVtb3ZlKCk7CisjaWYgRU5BQkxF KE5FVFNDQVBFX1BMVUdJTl9BUEkpCisgICAgICAgIGRhdGFUeXBlc1RvR3JhbmRmYXRoZXIgPSBk YXRhVHlwZXNUb1JlbW92ZSAtPSBXZWJzaXRlRGF0YVR5cGU6OlBsdWdJbkRhdGE7CisjZWxzZQor ICAgICAgICBkYXRhVHlwZXNUb0dyYW5kZmF0aGVyID0gZGF0YVR5cGVzVG9SZW1vdmU7CisjZW5k aWYKKyAgICB9CiAgICAgCiAgICAgLy8gU3dpdGNoIHRvIHRoZSBtYWluIHRocmVhZCB0byBnZXQg dGhlIGRlZmF1bHQgd2Vic2l0ZSBkYXRhIHN0b3JlCiAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3Bh dGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldICgpIG11dGFibGUgewot ICAgICAgICBXZWJQcm9jZXNzUHJveHk6OnRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zV2l0 aFdlYml0ZURhdGEoZGF0YVR5cGVzVG9SZW1vdmUsIG5vdGlmeVBhZ2VzLCBbdGhpc10oSGFzaFNl dDxTdHJpbmc+JiYgdG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnNXaXRoV2Vic2l0ZURhdGEp IG11dGFibGUgeworICAgICAgICBXZWJQcm9jZXNzUHJveHk6OnRvcFByaXZhdGVseUNvbnRyb2xs ZWREb21haW5zV2l0aFdlYml0ZURhdGEoZGF0YVR5cGVzVG9HcmFuZGZhdGhlciwgbm90aWZ5UGFn ZXMsIFt0aGlzXShIYXNoU2V0PFN0cmluZz4mJiB0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWlu c1dpdGhXZWJzaXRlRGF0YSkgbXV0YWJsZSB7CiAgICAgICAgICAgICAvLyBCdXQgYWx3YXlzIHRv dWNoIHRoZSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIHN0b3JlIG9uIHRoZSB3b3JrZXIgcXVldWUK ICAgICAgICAgICAgIG1fc3RhdGlzdGljc1F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVk VGhpcyA9IG1ha2VSZWYoKnRoaXMpLCB0b3BEb21haW5zID0gQ3Jvc3NUaHJlYWRDb3BpZXI8SGFz aFNldDxTdHJpbmc+Pjo6Y29weSh0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluc1dpdGhXZWJz aXRlRGF0YSldICgpIG11dGFibGUgewogICAgICAgICAgICAgICAgIHRoaXMtPmNvcmVTdG9yZSgp LmhhbmRsZUZyZXNoU3RhcnRXaXRoRW1wdHlPck5vU3RvcmUoV1RGTW92ZSh0b3BEb21haW5zKSk7 Cg== 315928 2017-07-19 10:03:35 -0700 2017-07-19 10:03:35 -0700 Patch bug-172840-20170719100335.patch text/plain 2646 jbedard SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMTk2NTYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA3LTE5ICBKb25hdGhhbiBC ZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBSZXNvdXJjZSBMb2FkIFN0YXRp c3RpY3M6IFNraXAgcGx1Z2luIGRhdGEgaW4gZ3JhbmRmYXRoZXJpbmcgdG8gYXZvaWQgdGV4dCBk aWZmIHRlc3QgZmFpbHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3Mjg0MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzI1MjQ4MTY+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpncmFuZGZhdGhlckV4aXN0aW5nV2Vic2l0ZURh dGEpOgorCiAyMDE3LTA3LTE5ICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29t PgogCiAgICAgICAgIFtXVEZdIEltcGxlbWVudCBXVEY6OlRocmVhZEdyb3VwCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZS5jcHAJKHJldmlzaW9uIDIxOTY1NSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI0MCw5ICsyNDAsMTkgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJl cwogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW5kZmF0aGVyRXhpc3Rp bmdXZWJzaXRlRGF0YSgpCiB7CiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CisgICAg CisgICAgLy8gRklYTUU6IFdlIHNob3VsZCBpbmNsdWRlIHBsdWdpbiBkYXRhIHdoZW4gPHJkYXI6 Ly9wcm9ibGVtLzMwNDkzOTk0PiBpcyByZXNvbHZlZC4KKyAgICBzdGF0aWMgT3B0aW9uU2V0PFdl YktpdDo6V2Vic2l0ZURhdGFUeXBlPiBkYXRhVHlwZXNUb0dyYW5kZmF0aGVyOworICAgIGlmIChk YXRhVHlwZXNUb0dyYW5kZmF0aGVyLmlzRW1wdHkoKSkgeworICAgICAgICBpZiAoZGF0YVR5cGVz VG9HcmFuZGZhdGhlci5pc0VtcHR5KCkpCisgICAgICAgICAgICBkYXRhVHlwZXNUb0dyYW5kZmF0 aGVyID0gZGF0YVR5cGVzVG9SZW1vdmUoKTsKKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQ SSkKKyAgICAgICAgICAgIGRhdGFUeXBlc1RvR3JhbmRmYXRoZXIgLT0gV2Vic2l0ZURhdGFUeXBl OjpQbHVnSW5EYXRhOworI2VuZGlmCisgICAgICAgIH0KIAogICAgIFJ1bkxvb3A6Om1haW4oKS5k aXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSAoKSBtdXRhYmxl IHsKLSAgICAgICAgV2ViUHJvY2Vzc1Byb3h5Ojp0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWlu c1dpdGhXZWJzaXRlRGF0YShkYXRhVHlwZXNUb1JlbW92ZSgpLCBtX3BhcmFtZXRlcnMuc2hvdWxk Tm90aWZ5UGFnZXNXaGVuRGF0YVJlY29yZHNXZXJlU2Nhbm5lZCwgW3RoaXMsIHByb3RlY3RlZFRo aXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpXSAoSGFzaFNldDxTdHJpbmc+JiYgdG9wUHJpdmF0 ZWx5Q29udHJvbGxlZERvbWFpbnNXaXRoV2Vic2l0ZURhdGEpIG11dGFibGUgeworICAgICAgICBX ZWJQcm9jZXNzUHJveHk6OnRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zV2l0aFdlYnNpdGVE YXRhKGRhdGFUeXBlc1RvR3JhbmRmYXRoZXIsIG1fcGFyYW1ldGVycy5zaG91bGROb3RpZnlQYWdl c1doZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1v dmUocHJvdGVjdGVkVGhpcyldIChIYXNoU2V0PFN0cmluZz4mJiB0b3BQcml2YXRlbHlDb250cm9s bGVkRG9tYWluc1dpdGhXZWJzaXRlRGF0YSkgbXV0YWJsZSB7CiAgICAgICAgICAgICBtX3N0YXRp c3RpY3NRdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3Rl Y3RlZFRoaXMpLCB0b3BEb21haW5zID0gQ3Jvc3NUaHJlYWRDb3BpZXI8SGFzaFNldDxTdHJpbmc+ Pjo6Y29weSh0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluc1dpdGhXZWJzaXRlRGF0YSldICgp IG11dGFibGUgewogICAgICAgICAgICAgICAgIGZvciAoYXV0byYgdG9wUHJpdmF0ZWx5Q29udHJv bGxlZERvbWFpbiA6IHRvcERvbWFpbnMpIHsKICAgICAgICAgICAgICAgICAgICAgYXV0byYgc3Rh dGlzdGljID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbih0b3BQcml2 YXRlbHlDb250cm9sbGVkRG9tYWluKTsK