181686 2018-01-16 09:20:14 -0800 [Win] Use switch when converting from ResourceRequestCachePolicy to platform cache policy. 2018-01-17 17:10:30 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan achristensen bfulgham commit-queue webkit-bug-importer oldest_to_newest 1389577 0 pvollan 2018-01-16 09:20:14 -0800 The current implementation of toPlatformRequestCachePolicy is not correct for all cases. 1389578 1 331393 pvollan 2018-01-16 09:23:08 -0800 Created attachment 331393 Patch 1389586 2 331393 bfulgham 2018-01-16 09:54:08 -0800 Comment on attachment 331393 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=331393&action=review Please add a better explanation of why this change is needed, and consider whether more things are needed in the switch statement. > Source/WebCore/ChangeLog:10 > + The current implementation of toPlatformRequestCachePolicy is not correct for all cases. I don't think this is clear enough. Is the issue that the casting operation is returning an incorrect kCFURL* constant? I think you should just say that. Did this stuff break after the Fetch API changes? > Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:202 > + return kCFURLRequestCachePolicyReloadIgnoringCache Do you need to do anything to support 'RefreshAnyCacheData'? It might be better to explicitly call out 'ReloadIgnoringCacheData, and DoNotUseAnyCache' before the 'default' just to show that they map to kCFURL*IgnoringCache. 1389599 3 achristensen 2018-01-16 10:25:43 -0800 Let's not have a default at all if possible. 1389708 4 pvollan 2018-01-16 12:59:00 -0800 (In reply to Brent Fulgham from comment #2) > Comment on attachment 331393 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=331393&action=review > > Please add a better explanation of why this change is needed, and consider > whether more things are needed in the switch statement. > > > Source/WebCore/ChangeLog:10 > > + The current implementation of toPlatformRequestCachePolicy is not correct for all cases. > > I don't think this is clear enough. Is the issue that the casting operation > is returning an incorrect kCFURL* constant? I think you should just say that. > > Did this stuff break after the Fetch API changes? > > > Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:202 > > + return kCFURLRequestCachePolicyReloadIgnoringCache > > Do you need to do anything to support 'RefreshAnyCacheData'? It might be > better to explicitly call out 'ReloadIgnoringCacheData, and > DoNotUseAnyCache' before the 'default' just to show that they map to > kCFURL*IgnoringCache. After looking into this more closely, it turns out that toPlatformRequestCachePolicy is actually implemented correctly as is. It is just not called in all places where it should. I will update the patch. Thanks for reviewing! 1389713 5 331420 pvollan 2018-01-16 13:06:31 -0800 Created attachment 331420 Patch 1390066 6 331420 achristensen 2018-01-17 10:10:48 -0800 Comment on attachment 331420 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=331420&action=review > Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:150 > + // To avoid MSVC warning: We usually put ASSERT_NOT_REACHED here instead of a comment. Some linux compilers also want such a final return statement. 1390067 7 pvollan 2018-01-17 10:14:45 -0800 (In reply to Alex Christensen from comment #6) > Comment on attachment 331420 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=331420&action=review > > > Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:150 > > + // To avoid MSVC warning: > > We usually put ASSERT_NOT_REACHED here instead of a comment. Some linux > compilers also want such a final return statement. Thanks for reviewing! I will update the patch before landing. 1390079 8 331512 pvollan 2018-01-17 10:40:18 -0800 Created attachment 331512 Patch 1390090 9 331512 commit-queue 2018-01-17 10:45:27 -0800 Comment on attachment 331512 Patch Rejecting attachment 331512 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 331512, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.webkit.org/results/6107978 1390092 10 331517 pvollan 2018-01-17 10:48:17 -0800 Created attachment 331517 Patch 1390135 11 331517 commit-queue 2018-01-17 11:35:25 -0800 Comment on attachment 331517 Patch Clearing flags on attachment: 331517 Committed r227077: <https://trac.webkit.org/changeset/227077> 1390303 12 webkit-bug-importer 2018-01-17 17:10:30 -0800 <rdar://problem/36602111> 331393 2018-01-16 09:23:08 -0800 2018-01-16 13:06:30 -0800 Patch bug-181686-20180116092307.patch text/plain 1949 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNjk3NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE4LTAxLTE2ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2luXSBVc2Ugc3dpdGNo IHdoZW4gY29udmVydGluZyBmcm9tIFJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5IHRvIHBsYXRm b3JtIGNhY2hlIHBvbGljeS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4MTY4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAg ICAgICBUaGUgY3VycmVudCBpbXBsZW1lbnRhdGlvbiBvZiB0b1BsYXRmb3JtUmVxdWVzdENhY2hl UG9saWN5IGlzIG5vdCBjb3JyZWN0IGZvciBhbGwgY2FzZXMuIAorCisgICAgICAgICogcGxhdGZv cm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHA6CisgICAgICAgIChXZWJDb3Jl Ojp0b1BsYXRmb3JtUmVxdWVzdENhY2hlUG9saWN5KToKKwogMjAxOC0wMS0xNiAgUGhpbGlwcGUg Tm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gTGl2 ZSBzdHJlYW1pbmcgY2xlYW51cHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY2YvUmVzb3VyY2VSZXF1ZXN0Q0ZOZXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VSZXF1ZXN0Q0ZOZXQuY3BwCShyZXZpc2lv biAyMjY5NzQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNl UmVxdWVzdENGTmV0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTg5LDEwICsxODksMTggQEAgdm9p ZCBSZXNvdXJjZVJlcXVlc3Q6OmRvVXBkYXRlUGxhdGZvcm1SZQogI2VuZGlmCiB9CiAKLS8vIEZJ WE1FOiBXZSBzaG91bGQgdXNlIGEgc3dpdGNoIGJhc2VkIG9uIFJlc291cmNlUmVxdWVzdENhY2hl UG9saWN5IHBhcmFtZXRlcgogc3RhdGljIGlubGluZSBDRlVSTFJlcXVlc3RDYWNoZVBvbGljeSB0 b1BsYXRmb3JtUmVxdWVzdENhY2hlUG9saWN5KFJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5IHBv bGljeSkKIHsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Q0ZVUkxSZXF1ZXN0Q2FjaGVQb2xpY3k+ KChwb2xpY3kgPD0gUmV0dXJuQ2FjaGVEYXRhRG9udExvYWQpID8gcG9saWN5IDogUmVsb2FkSWdu b3JpbmdDYWNoZURhdGEpOworICAgIHN3aXRjaCAocG9saWN5KSB7CisgICAgY2FzZSBVc2VQcm90 b2NvbENhY2hlUG9saWN5OgorICAgICAgICByZXR1cm4ga0NGVVJMUmVxdWVzdENhY2hlUG9saWN5 UHJvdG9jb2xEZWZhdWx0OworICAgIGNhc2UgUmV0dXJuQ2FjaGVEYXRhRWxzZUxvYWQ6CisgICAg ICAgIHJldHVybiBrQ0ZVUkxSZXF1ZXN0Q2FjaGVQb2xpY3lSZXR1cm5DYWNoZURhdGFFbHNlTG9h ZDsKKyAgICBjYXNlIFJldHVybkNhY2hlRGF0YURvbnRMb2FkOgorICAgICAgICByZXR1cm4ga0NG VVJMUmVxdWVzdENhY2hlUG9saWN5UmV0dXJuQ2FjaGVEYXRhRG9udExvYWQ7CisgICAgZGVmYXVs dDoKKyAgICAgICAgcmV0dXJuIGtDRlVSTFJlcXVlc3RDYWNoZVBvbGljeVJlbG9hZElnbm9yaW5n Q2FjaGUKKyAgICB9CiB9CiAKIHZvaWQgUmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVBsYXRmb3Jt SFRUUEJvZHkoKQo= 331420 2018-01-16 13:06:31 -0800 2018-01-17 10:10:48 -0800 Patch bug-181686-20180116220630.patch text/plain 4178 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNjk3NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE4LTAxLTE2ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2luXSBVc2Ugc3dpdGNo IHdoZW4gY29udmVydGluZyBmcm9tIFJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5IHRvIHBsYXRm b3JtIGNhY2hlIHBvbGljeS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4MTY4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAg ICAgICBBIHN3aXRjaCB3aWxsIG1ha2UgdGhlIGZ1bmN0aW9uIGVhc2llciBvbiB0aGUgZXllcy4g QWxzbywgdXNlIHRoZSBmdW5jdGlvbiBpbiBwbGFjZXMgd2hlcmUgdGhlIFJlc291cmNlUmVxdWVz dENhY2hlUG9saWN5CisgICAgICAgIGlzIGp1c3QgY2FzdGVkIHRvIGEgcGxhdGZvcm0gY2FjaGUg cG9saWN5LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RD Rk5ldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b1BsYXRmb3JtUmVxdWVzdENhY2hlUG9saWN5 KToKKwogMjAxOC0wMS0xNiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dTdHJlYW1lcl0gTGl2ZSBzdHJlYW1pbmcgY2xlYW51cHMKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VSZXF1ZXN0Q0ZOZXQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3Vy Y2VSZXF1ZXN0Q0ZOZXQuY3BwCShyZXZpc2lvbiAyMjY5NzUpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVzdENGTmV0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTMyLDYgKzEzMiwyNSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgc2V0SGVhZGVyRmllbGRz KENGTXV0CiAgICAgICAgIENGVVJMUmVxdWVzdFNldEhUVFBIZWFkZXJGaWVsZFZhbHVlKHJlcXVl c3QsIGhlYWRlci5rZXkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwgaGVhZGVyLnZhbHVlLmNyZWF0 ZUNGU3RyaW5nKCkuZ2V0KCkpOwogfQogCitzdGF0aWMgaW5saW5lIENGVVJMUmVxdWVzdENhY2hl UG9saWN5IHRvUGxhdGZvcm1SZXF1ZXN0Q2FjaGVQb2xpY3koUmVzb3VyY2VSZXF1ZXN0Q2FjaGVQ b2xpY3kgcG9saWN5KQoreworICAgIHN3aXRjaCAocG9saWN5KSB7CisgICAgY2FzZSBVc2VQcm90 b2NvbENhY2hlUG9saWN5OgorICAgICAgICByZXR1cm4ga0NGVVJMUmVxdWVzdENhY2hlUG9saWN5 UHJvdG9jb2xEZWZhdWx0OworICAgIGNhc2UgUmV0dXJuQ2FjaGVEYXRhRWxzZUxvYWQ6CisgICAg ICAgIHJldHVybiBrQ0ZVUkxSZXF1ZXN0Q2FjaGVQb2xpY3lSZXR1cm5DYWNoZURhdGFFbHNlTG9h ZDsKKyAgICBjYXNlIFJldHVybkNhY2hlRGF0YURvbnRMb2FkOgorICAgICAgICByZXR1cm4ga0NG VVJMUmVxdWVzdENhY2hlUG9saWN5UmV0dXJuQ2FjaGVEYXRhRG9udExvYWQ7CisgICAgY2FzZSBS ZWxvYWRJZ25vcmluZ0NhY2hlRGF0YToKKyAgICBjYXNlIERvTm90VXNlQW55Q2FjaGU6CisgICAg Y2FzZSBSZWZyZXNoQW55Q2FjaGVEYXRhOgorICAgICAgICByZXR1cm4ga0NGVVJMUmVxdWVzdENh Y2hlUG9saWN5UmVsb2FkSWdub3JpbmdDYWNoZTsKKyAgICB9CisKKyAgICAvLyBUbyBhdm9pZCBN U1ZDIHdhcm5pbmc6CisgICAgcmV0dXJuIGtDRlVSTFJlcXVlc3RDYWNoZVBvbGljeVJlbG9hZEln bm9yaW5nQ2FjaGU7Cit9CisKIHZvaWQgUmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVBsYXRmb3Jt UmVxdWVzdCgpCiB7CiAgICAgQ0ZNdXRhYmxlVVJMUmVxdWVzdFJlZiBjZlJlcXVlc3Q7CkBAIC0x NDMsMTAgKzE2MiwxMCBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVQbGF0Zm9ybVJl CiAgICAgICAgIGNmUmVxdWVzdCA9IENGVVJMUmVxdWVzdENyZWF0ZU11dGFibGVDb3B5KDAsIG1f Y2ZSZXF1ZXN0LmdldCgpKTsKICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0VVJMKGNmUmVxdWVzdCwg dXJsLmdldCgpKTsKICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0TWFpbkRvY3VtZW50VVJMKGNmUmVx dWVzdCwgZmlyc3RQYXJ0eUZvckNvb2tpZXMuZ2V0KCkpOwotICAgICAgICBDRlVSTFJlcXVlc3RT ZXRDYWNoZVBvbGljeShjZlJlcXVlc3QsIChDRlVSTFJlcXVlc3RDYWNoZVBvbGljeSljYWNoZVBv bGljeSgpKTsKKyAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0Q2FjaGVQb2xpY3koY2ZSZXF1ZXN0LCB0 b1BsYXRmb3JtUmVxdWVzdENhY2hlUG9saWN5KGNhY2hlUG9saWN5KCkpKTsKICAgICAgICAgQ0ZV UkxSZXF1ZXN0U2V0VGltZW91dEludGVydmFsKGNmUmVxdWVzdCwgdGltZW91dEludGVydmFsKTsK ICAgICB9IGVsc2UKLSAgICAgICAgY2ZSZXF1ZXN0ID0gQ0ZVUkxSZXF1ZXN0Q3JlYXRlTXV0YWJs ZSgwLCB1cmwuZ2V0KCksIChDRlVSTFJlcXVlc3RDYWNoZVBvbGljeSljYWNoZVBvbGljeSgpLCB0 aW1lb3V0SW50ZXJ2YWwsIGZpcnN0UGFydHlGb3JDb29raWVzLmdldCgpKTsKKyAgICAgICAgY2ZS ZXF1ZXN0ID0gQ0ZVUkxSZXF1ZXN0Q3JlYXRlTXV0YWJsZSgwLCB1cmwuZ2V0KCksIHRvUGxhdGZv cm1SZXF1ZXN0Q2FjaGVQb2xpY3koY2FjaGVQb2xpY3koKSksIHRpbWVvdXRJbnRlcnZhbCwgZmly c3RQYXJ0eUZvckNvb2tpZXMuZ2V0KCkpOwogCiAgICAgQ0ZVUkxSZXF1ZXN0U2V0SFRUUFJlcXVl c3RNZXRob2QoY2ZSZXF1ZXN0LCBodHRwTWV0aG9kKCkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSk7 CiAKQEAgLTE4OSwxMiArMjA4LDYgQEAgdm9pZCBSZXNvdXJjZVJlcXVlc3Q6OmRvVXBkYXRlUGxh dGZvcm1SZQogI2VuZGlmCiB9CiAKLS8vIEZJWE1FOiBXZSBzaG91bGQgdXNlIGEgc3dpdGNoIGJh c2VkIG9uIFJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5IHBhcmFtZXRlcgotc3RhdGljIGlubGlu ZSBDRlVSTFJlcXVlc3RDYWNoZVBvbGljeSB0b1BsYXRmb3JtUmVxdWVzdENhY2hlUG9saWN5KFJl c291cmNlUmVxdWVzdENhY2hlUG9saWN5IHBvbGljeSkKLXsKLSAgICByZXR1cm4gc3RhdGljX2Nh c3Q8Q0ZVUkxSZXF1ZXN0Q2FjaGVQb2xpY3k+KChwb2xpY3kgPD0gUmV0dXJuQ2FjaGVEYXRhRG9u dExvYWQpID8gcG9saWN5IDogUmVsb2FkSWdub3JpbmdDYWNoZURhdGEpOwotfQotCiB2b2lkIFJl c291cmNlUmVxdWVzdDo6ZG9VcGRhdGVQbGF0Zm9ybUhUVFBCb2R5KCkKIHsKICAgICBDRk11dGFi bGVVUkxSZXF1ZXN0UmVmIGNmUmVxdWVzdDsKQEAgLTIwOSw3ICsyMjIsNyBAQCB2b2lkIFJlc291 cmNlUmVxdWVzdDo6ZG9VcGRhdGVQbGF0Zm9ybUhUCiAgICAgICAgIENGVVJMUmVxdWVzdFNldENh Y2hlUG9saWN5KGNmUmVxdWVzdCwgdG9QbGF0Zm9ybVJlcXVlc3RDYWNoZVBvbGljeShjYWNoZVBv bGljeSgpKSk7CiAgICAgICAgIENGVVJMUmVxdWVzdFNldFRpbWVvdXRJbnRlcnZhbChjZlJlcXVl c3QsIHRpbWVvdXRJbnRlcnZhbCk7CiAgICAgfSBlbHNlCi0gICAgICAgIGNmUmVxdWVzdCA9IENG VVJMUmVxdWVzdENyZWF0ZU11dGFibGUoMCwgdXJsLmdldCgpLCAoQ0ZVUkxSZXF1ZXN0Q2FjaGVQ b2xpY3kpY2FjaGVQb2xpY3koKSwgdGltZW91dEludGVydmFsLCBmaXJzdFBhcnR5Rm9yQ29va2ll cy5nZXQoKSk7CisgICAgICAgIGNmUmVxdWVzdCA9IENGVVJMUmVxdWVzdENyZWF0ZU11dGFibGUo MCwgdXJsLmdldCgpLCB0b1BsYXRmb3JtUmVxdWVzdENhY2hlUG9saWN5KGNhY2hlUG9saWN5KCkp LCB0aW1lb3V0SW50ZXJ2YWwsIGZpcnN0UGFydHlGb3JDb29raWVzLmdldCgpKTsKIAogICAgIEZv cm1EYXRhKiBmb3JtRGF0YSA9IGh0dHBCb2R5KCk7CiAgICAgaWYgKGZvcm1EYXRhICYmICFmb3Jt RGF0YS0+aXNFbXB0eSgpKQo= 331512 2018-01-17 10:40:18 -0800 2018-01-17 10:47:50 -0800 Patch bug-181686-20180117194018.patch text/plain 4237 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNzA2OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE4LTAxLTE2ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2luXSBVc2Ugc3dpdGNo IHdoZW4gY29udmVydGluZyBmcm9tIFJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5IHRvIHBsYXRm b3JtIGNhY2hlIHBvbGljeS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4MTY4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAg ICAgICBBIHN3aXRjaCB3aWxsIG1ha2UgdGhlIGZ1bmN0aW9uIGVhc2llciBvbiB0aGUgZXllcy4g QWxzbywgdXNlIHRoZSBmdW5jdGlvbiBpbiBwbGFjZXMgd2hlcmUgdGhlIFJlc291cmNlUmVxdWVz dENhY2hlUG9saWN5CisgICAgICAgIGlzIGp1c3QgY2FzdGVkIHRvIGEgcGxhdGZvcm0gY2FjaGUg cG9saWN5LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RD Rk5ldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b1BsYXRmb3JtUmVxdWVzdENhY2hlUG9saWN5 KToKKwogMjAxOC0wMS0xNyAgU3RlcGhhbiBTemFibyAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+ CiAKICAgICAgICAgUGFnZS5jcHAgb25seSBzZWVzIGZvcndhcmQgZGVjbGFyYXRpb24gb2YgQXBw bGljYXRpb25TdGF0ZUNoYW5nZUxpc3RlbmVyIHdoZW4gRU5BQkxFKFZJREVPKSBpcyBvZmYKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VSZXF1ZXN0Q0ZO ZXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2Yv UmVzb3VyY2VSZXF1ZXN0Q0ZOZXQuY3BwCShyZXZpc2lvbiAyMjcwNjkpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVzdENGTmV0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTMyLDYgKzEzMiwyNSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgc2V0SGVhZGVy RmllbGRzKENGTXV0CiAgICAgICAgIENGVVJMUmVxdWVzdFNldEhUVFBIZWFkZXJGaWVsZFZhbHVl KHJlcXVlc3QsIGhlYWRlci5rZXkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwgaGVhZGVyLnZhbHVl LmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCkpOwogfQogCitzdGF0aWMgaW5saW5lIENGVVJMUmVxdWVz dENhY2hlUG9saWN5IHRvUGxhdGZvcm1SZXF1ZXN0Q2FjaGVQb2xpY3koUmVzb3VyY2VSZXF1ZXN0 Q2FjaGVQb2xpY3kgcG9saWN5KQoreworICAgIHN3aXRjaCAocG9saWN5KSB7CisgICAgY2FzZSBV c2VQcm90b2NvbENhY2hlUG9saWN5OgorICAgICAgICByZXR1cm4ga0NGVVJMUmVxdWVzdENhY2hl UG9saWN5UHJvdG9jb2xEZWZhdWx0OworICAgIGNhc2UgUmV0dXJuQ2FjaGVEYXRhRWxzZUxvYWQ6 CisgICAgICAgIHJldHVybiBrQ0ZVUkxSZXF1ZXN0Q2FjaGVQb2xpY3lSZXR1cm5DYWNoZURhdGFF bHNlTG9hZDsKKyAgICBjYXNlIFJldHVybkNhY2hlRGF0YURvbnRMb2FkOgorICAgICAgICByZXR1 cm4ga0NGVVJMUmVxdWVzdENhY2hlUG9saWN5UmV0dXJuQ2FjaGVEYXRhRG9udExvYWQ7CisgICAg Y2FzZSBSZWxvYWRJZ25vcmluZ0NhY2hlRGF0YToKKyAgICBjYXNlIERvTm90VXNlQW55Q2FjaGU6 CisgICAgY2FzZSBSZWZyZXNoQW55Q2FjaGVEYXRhOgorICAgICAgICByZXR1cm4ga0NGVVJMUmVx dWVzdENhY2hlUG9saWN5UmVsb2FkSWdub3JpbmdDYWNoZTsKKyAgICB9CisKKyAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4ga0NGVVJMUmVxdWVzdENhY2hlUG9saWN5UmVsb2Fk SWdub3JpbmdDYWNoZTsKK30KKwogdm9pZCBSZXNvdXJjZVJlcXVlc3Q6OmRvVXBkYXRlUGxhdGZv cm1SZXF1ZXN0KCkKIHsKICAgICBDRk11dGFibGVVUkxSZXF1ZXN0UmVmIGNmUmVxdWVzdDsKQEAg LTE0MywxMCArMTYyLDEwIEBAIHZvaWQgUmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVBsYXRmb3Jt UmUKICAgICAgICAgY2ZSZXF1ZXN0ID0gQ0ZVUkxSZXF1ZXN0Q3JlYXRlTXV0YWJsZUNvcHkoMCwg bV9jZlJlcXVlc3QuZ2V0KCkpOwogICAgICAgICBDRlVSTFJlcXVlc3RTZXRVUkwoY2ZSZXF1ZXN0 LCB1cmwuZ2V0KCkpOwogICAgICAgICBDRlVSTFJlcXVlc3RTZXRNYWluRG9jdW1lbnRVUkwoY2ZS ZXF1ZXN0LCBmaXJzdFBhcnR5Rm9yQ29va2llcy5nZXQoKSk7Ci0gICAgICAgIENGVVJMUmVxdWVz dFNldENhY2hlUG9saWN5KGNmUmVxdWVzdCwgKENGVVJMUmVxdWVzdENhY2hlUG9saWN5KWNhY2hl UG9saWN5KCkpOworICAgICAgICBDRlVSTFJlcXVlc3RTZXRDYWNoZVBvbGljeShjZlJlcXVlc3Qs IHRvUGxhdGZvcm1SZXF1ZXN0Q2FjaGVQb2xpY3koY2FjaGVQb2xpY3koKSkpOwogICAgICAgICBD RlVSTFJlcXVlc3RTZXRUaW1lb3V0SW50ZXJ2YWwoY2ZSZXF1ZXN0LCB0aW1lb3V0SW50ZXJ2YWwp OwogICAgIH0gZWxzZQotICAgICAgICBjZlJlcXVlc3QgPSBDRlVSTFJlcXVlc3RDcmVhdGVNdXRh YmxlKDAsIHVybC5nZXQoKSwgKENGVVJMUmVxdWVzdENhY2hlUG9saWN5KWNhY2hlUG9saWN5KCks IHRpbWVvdXRJbnRlcnZhbCwgZmlyc3RQYXJ0eUZvckNvb2tpZXMuZ2V0KCkpOworICAgICAgICBj ZlJlcXVlc3QgPSBDRlVSTFJlcXVlc3RDcmVhdGVNdXRhYmxlKDAsIHVybC5nZXQoKSwgdG9QbGF0 Zm9ybVJlcXVlc3RDYWNoZVBvbGljeShjYWNoZVBvbGljeSgpKSwgdGltZW91dEludGVydmFsLCBm aXJzdFBhcnR5Rm9yQ29va2llcy5nZXQoKSk7CiAKICAgICBDRlVSTFJlcXVlc3RTZXRIVFRQUmVx dWVzdE1ldGhvZChjZlJlcXVlc3QsIGh0dHBNZXRob2QoKS5jcmVhdGVDRlN0cmluZygpLmdldCgp KTsKIApAQCAtMTg5LDEyICsyMDgsNiBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVQ bGF0Zm9ybVJlCiAjZW5kaWYKIH0KIAotLy8gRklYTUU6IFdlIHNob3VsZCB1c2UgYSBzd2l0Y2gg YmFzZWQgb24gUmVzb3VyY2VSZXF1ZXN0Q2FjaGVQb2xpY3kgcGFyYW1ldGVyCi1zdGF0aWMgaW5s aW5lIENGVVJMUmVxdWVzdENhY2hlUG9saWN5IHRvUGxhdGZvcm1SZXF1ZXN0Q2FjaGVQb2xpY3ko UmVzb3VyY2VSZXF1ZXN0Q2FjaGVQb2xpY3kgcG9saWN5KQotewotICAgIHJldHVybiBzdGF0aWNf Y2FzdDxDRlVSTFJlcXVlc3RDYWNoZVBvbGljeT4oKHBvbGljeSA8PSBSZXR1cm5DYWNoZURhdGFE b250TG9hZCkgPyBwb2xpY3kgOiBSZWxvYWRJZ25vcmluZ0NhY2hlRGF0YSk7Ci19Ci0KIHZvaWQg UmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVBsYXRmb3JtSFRUUEJvZHkoKQogewogICAgIENGTXV0 YWJsZVVSTFJlcXVlc3RSZWYgY2ZSZXF1ZXN0OwpAQCAtMjA5LDcgKzIyMiw3IEBAIHZvaWQgUmVz b3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVBsYXRmb3JtSFQKICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0 Q2FjaGVQb2xpY3koY2ZSZXF1ZXN0LCB0b1BsYXRmb3JtUmVxdWVzdENhY2hlUG9saWN5KGNhY2hl UG9saWN5KCkpKTsKICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0VGltZW91dEludGVydmFsKGNmUmVx dWVzdCwgdGltZW91dEludGVydmFsKTsKICAgICB9IGVsc2UKLSAgICAgICAgY2ZSZXF1ZXN0ID0g Q0ZVUkxSZXF1ZXN0Q3JlYXRlTXV0YWJsZSgwLCB1cmwuZ2V0KCksIChDRlVSTFJlcXVlc3RDYWNo ZVBvbGljeSljYWNoZVBvbGljeSgpLCB0aW1lb3V0SW50ZXJ2YWwsIGZpcnN0UGFydHlGb3JDb29r aWVzLmdldCgpKTsKKyAgICAgICAgY2ZSZXF1ZXN0ID0gQ0ZVUkxSZXF1ZXN0Q3JlYXRlTXV0YWJs ZSgwLCB1cmwuZ2V0KCksIHRvUGxhdGZvcm1SZXF1ZXN0Q2FjaGVQb2xpY3koY2FjaGVQb2xpY3ko KSksIHRpbWVvdXRJbnRlcnZhbCwgZmlyc3RQYXJ0eUZvckNvb2tpZXMuZ2V0KCkpOwogCiAgICAg Rm9ybURhdGEqIGZvcm1EYXRhID0gaHR0cEJvZHkoKTsKICAgICBpZiAoZm9ybURhdGEgJiYgIWZv cm1EYXRhLT5pc0VtcHR5KCkpCg== 331517 2018-01-17 10:48:17 -0800 2018-01-17 11:35:25 -0800 Patch bug-181686-20180117194817.patch text/plain 4239 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNzA2OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE4LTAxLTE2ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2luXSBVc2Ugc3dpdGNo IHdoZW4gY29udmVydGluZyBmcm9tIFJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5IHRvIHBsYXRm b3JtIGNhY2hlIHBvbGljeS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4MTY4NgorCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4u CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisg ICAgICAgIEEgc3dpdGNoIHdpbGwgbWFrZSB0aGUgZnVuY3Rpb24gZWFzaWVyIG9uIHRoZSBleWVz LiBBbHNvLCB1c2UgdGhlIGZ1bmN0aW9uIGluIHBsYWNlcyB3aGVyZSB0aGUgUmVzb3VyY2VSZXF1 ZXN0Q2FjaGVQb2xpY3kKKyAgICAgICAgaXMganVzdCBjYXN0ZWQgdG8gYSBwbGF0Zm9ybSBjYWNo ZSBwb2xpY3kuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVz dENGTmV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRvUGxhdGZvcm1SZXF1ZXN0Q2FjaGVQb2xp Y3kpOgorCiAyMDE4LTAxLTE3ICBTdGVwaGFuIFN6YWJvICA8c3RlcGhhbi5zemFib0Bzb255LmNv bT4KIAogICAgICAgICBQYWdlLmNwcCBvbmx5IHNlZXMgZm9yd2FyZCBkZWNsYXJhdGlvbiBvZiBB cHBsaWNhdGlvblN0YXRlQ2hhbmdlTGlzdGVuZXIgd2hlbiBFTkFCTEUoVklERU8pIGlzIG9mZgpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RD Rk5ldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j Zi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHAJKHJldmlzaW9uIDIyNzA2OSkKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VSZXF1ZXN0Q0ZOZXQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMzIsNiArMTMyLDI1IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBzZXRIZWFk ZXJGaWVsZHMoQ0ZNdXQKICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0SFRUUEhlYWRlckZpZWxkVmFs dWUocmVxdWVzdCwgaGVhZGVyLmtleS5jcmVhdGVDRlN0cmluZygpLmdldCgpLCBoZWFkZXIudmFs dWUuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgQ0ZVUkxSZXF1 ZXN0Q2FjaGVQb2xpY3kgdG9QbGF0Zm9ybVJlcXVlc3RDYWNoZVBvbGljeShSZXNvdXJjZVJlcXVl c3RDYWNoZVBvbGljeSBwb2xpY3kpCit7CisgICAgc3dpdGNoIChwb2xpY3kpIHsKKyAgICBjYXNl IFVzZVByb3RvY29sQ2FjaGVQb2xpY3k6CisgICAgICAgIHJldHVybiBrQ0ZVUkxSZXF1ZXN0Q2Fj aGVQb2xpY3lQcm90b2NvbERlZmF1bHQ7CisgICAgY2FzZSBSZXR1cm5DYWNoZURhdGFFbHNlTG9h ZDoKKyAgICAgICAgcmV0dXJuIGtDRlVSTFJlcXVlc3RDYWNoZVBvbGljeVJldHVybkNhY2hlRGF0 YUVsc2VMb2FkOworICAgIGNhc2UgUmV0dXJuQ2FjaGVEYXRhRG9udExvYWQ6CisgICAgICAgIHJl dHVybiBrQ0ZVUkxSZXF1ZXN0Q2FjaGVQb2xpY3lSZXR1cm5DYWNoZURhdGFEb250TG9hZDsKKyAg ICBjYXNlIFJlbG9hZElnbm9yaW5nQ2FjaGVEYXRhOgorICAgIGNhc2UgRG9Ob3RVc2VBbnlDYWNo ZToKKyAgICBjYXNlIFJlZnJlc2hBbnlDYWNoZURhdGE6CisgICAgICAgIHJldHVybiBrQ0ZVUkxS ZXF1ZXN0Q2FjaGVQb2xpY3lSZWxvYWRJZ25vcmluZ0NhY2hlOworICAgIH0KKworICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBrQ0ZVUkxSZXF1ZXN0Q2FjaGVQb2xpY3lSZWxv YWRJZ25vcmluZ0NhY2hlOworfQorCiB2b2lkIFJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVQbGF0 Zm9ybVJlcXVlc3QoKQogewogICAgIENGTXV0YWJsZVVSTFJlcXVlc3RSZWYgY2ZSZXF1ZXN0OwpA QCAtMTQzLDEwICsxNjIsMTAgQEAgdm9pZCBSZXNvdXJjZVJlcXVlc3Q6OmRvVXBkYXRlUGxhdGZv cm1SZQogICAgICAgICBjZlJlcXVlc3QgPSBDRlVSTFJlcXVlc3RDcmVhdGVNdXRhYmxlQ29weSgw LCBtX2NmUmVxdWVzdC5nZXQoKSk7CiAgICAgICAgIENGVVJMUmVxdWVzdFNldFVSTChjZlJlcXVl c3QsIHVybC5nZXQoKSk7CiAgICAgICAgIENGVVJMUmVxdWVzdFNldE1haW5Eb2N1bWVudFVSTChj ZlJlcXVlc3QsIGZpcnN0UGFydHlGb3JDb29raWVzLmdldCgpKTsKLSAgICAgICAgQ0ZVUkxSZXF1 ZXN0U2V0Q2FjaGVQb2xpY3koY2ZSZXF1ZXN0LCAoQ0ZVUkxSZXF1ZXN0Q2FjaGVQb2xpY3kpY2Fj aGVQb2xpY3koKSk7CisgICAgICAgIENGVVJMUmVxdWVzdFNldENhY2hlUG9saWN5KGNmUmVxdWVz dCwgdG9QbGF0Zm9ybVJlcXVlc3RDYWNoZVBvbGljeShjYWNoZVBvbGljeSgpKSk7CiAgICAgICAg IENGVVJMUmVxdWVzdFNldFRpbWVvdXRJbnRlcnZhbChjZlJlcXVlc3QsIHRpbWVvdXRJbnRlcnZh bCk7CiAgICAgfSBlbHNlCi0gICAgICAgIGNmUmVxdWVzdCA9IENGVVJMUmVxdWVzdENyZWF0ZU11 dGFibGUoMCwgdXJsLmdldCgpLCAoQ0ZVUkxSZXF1ZXN0Q2FjaGVQb2xpY3kpY2FjaGVQb2xpY3ko KSwgdGltZW91dEludGVydmFsLCBmaXJzdFBhcnR5Rm9yQ29va2llcy5nZXQoKSk7CisgICAgICAg IGNmUmVxdWVzdCA9IENGVVJMUmVxdWVzdENyZWF0ZU11dGFibGUoMCwgdXJsLmdldCgpLCB0b1Bs YXRmb3JtUmVxdWVzdENhY2hlUG9saWN5KGNhY2hlUG9saWN5KCkpLCB0aW1lb3V0SW50ZXJ2YWws IGZpcnN0UGFydHlGb3JDb29raWVzLmdldCgpKTsKIAogICAgIENGVVJMUmVxdWVzdFNldEhUVFBS ZXF1ZXN0TWV0aG9kKGNmUmVxdWVzdCwgaHR0cE1ldGhvZCgpLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0 KCkpOwogCkBAIC0xODksMTIgKzIwOCw2IEBAIHZvaWQgUmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0 ZVBsYXRmb3JtUmUKICNlbmRpZgogfQogCi0vLyBGSVhNRTogV2Ugc2hvdWxkIHVzZSBhIHN3aXRj aCBiYXNlZCBvbiBSZXNvdXJjZVJlcXVlc3RDYWNoZVBvbGljeSBwYXJhbWV0ZXIKLXN0YXRpYyBp bmxpbmUgQ0ZVUkxSZXF1ZXN0Q2FjaGVQb2xpY3kgdG9QbGF0Zm9ybVJlcXVlc3RDYWNoZVBvbGlj eShSZXNvdXJjZVJlcXVlc3RDYWNoZVBvbGljeSBwb2xpY3kpCi17Ci0gICAgcmV0dXJuIHN0YXRp Y19jYXN0PENGVVJMUmVxdWVzdENhY2hlUG9saWN5PigocG9saWN5IDw9IFJldHVybkNhY2hlRGF0 YURvbnRMb2FkKSA/IHBvbGljeSA6IFJlbG9hZElnbm9yaW5nQ2FjaGVEYXRhKTsKLX0KLQogdm9p ZCBSZXNvdXJjZVJlcXVlc3Q6OmRvVXBkYXRlUGxhdGZvcm1IVFRQQm9keSgpCiB7CiAgICAgQ0ZN dXRhYmxlVVJMUmVxdWVzdFJlZiBjZlJlcXVlc3Q7CkBAIC0yMDksNyArMjIyLDcgQEAgdm9pZCBS ZXNvdXJjZVJlcXVlc3Q6OmRvVXBkYXRlUGxhdGZvcm1IVAogICAgICAgICBDRlVSTFJlcXVlc3RT ZXRDYWNoZVBvbGljeShjZlJlcXVlc3QsIHRvUGxhdGZvcm1SZXF1ZXN0Q2FjaGVQb2xpY3koY2Fj aGVQb2xpY3koKSkpOwogICAgICAgICBDRlVSTFJlcXVlc3RTZXRUaW1lb3V0SW50ZXJ2YWwoY2ZS ZXF1ZXN0LCB0aW1lb3V0SW50ZXJ2YWwpOwogICAgIH0gZWxzZQotICAgICAgICBjZlJlcXVlc3Qg PSBDRlVSTFJlcXVlc3RDcmVhdGVNdXRhYmxlKDAsIHVybC5nZXQoKSwgKENGVVJMUmVxdWVzdENh Y2hlUG9saWN5KWNhY2hlUG9saWN5KCksIHRpbWVvdXRJbnRlcnZhbCwgZmlyc3RQYXJ0eUZvckNv b2tpZXMuZ2V0KCkpOworICAgICAgICBjZlJlcXVlc3QgPSBDRlVSTFJlcXVlc3RDcmVhdGVNdXRh YmxlKDAsIHVybC5nZXQoKSwgdG9QbGF0Zm9ybVJlcXVlc3RDYWNoZVBvbGljeShjYWNoZVBvbGlj eSgpKSwgdGltZW91dEludGVydmFsLCBmaXJzdFBhcnR5Rm9yQ29va2llcy5nZXQoKSk7CiAKICAg ICBGb3JtRGF0YSogZm9ybURhdGEgPSBodHRwQm9keSgpOwogICAgIGlmIChmb3JtRGF0YSAmJiAh Zm9ybURhdGEtPmlzRW1wdHkoKSkK