208298 2020-02-27 05:47:50 -0800 Load async scripts with low priority 2020-02-27 08:03:17 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned andersca beidson cdumez commit-queue dbates esprehn+autocc ews-watchlist ggaren gyuyoung.kim kangil.han nham webkit-bug-importer oldest_to_newest 1623420 0 koivisto 2020-02-27 05:47:50 -0800 They are assumed to be non-critical. This matches other browsers. 1623435 1 391854 koivisto 2020-02-27 06:32:39 -0800 Created attachment 391854 patch 1623453 2 391854 andersca 2020-02-27 07:02:38 -0800 Comment on attachment 391854 patch View in context: https://bugs.webkit.org/attachment.cgi?id=391854&action=review > Source/WebCore/dom/LoadableClassicScript.cpp:134 > + return { }; I'd return std::nullopt here, but that's just me. 1623478 3 391854 commit-queue 2020-02-27 08:02:14 -0800 Comment on attachment 391854 patch Clearing flags on attachment: 391854 Committed r257566: <https://trac.webkit.org/changeset/257566> 1623479 4 commit-queue 2020-02-27 08:02:15 -0800 All reviewed patches have been landed. Closing bug. 1623481 5 webkit-bug-importer 2020-02-27 08:03:17 -0800 <rdar://problem/59847342> 391854 2020-02-27 06:32:39 -0800 2020-02-27 08:02:14 -0800 patch async-script-priority.patch text/plain 13485 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYzZkYWNmNmZlYS4uYTZlYzA4YzA2OGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0OSBAQAorMjAyMC0wMi0yNyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CisKKyAgICAgICAgTG9hZCBhc3luYyBzY3JpcHRzIHdpdGggbG93IHByaW9yaXR5CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDgyOTgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGV5IGFyZSBhc3N1bWVk IHRvIGJlIG5vbi1jcml0aWNhbCBhbmQgZG9uJ3QgZGVsYXkgRE9NQ29udGVudExvYWRlZC4KKwor ICAgICAgICBUaGlzIG1hdGNoZXMgb3RoZXIgYnJvd3NlcnMuIFNlZSBodHRwczovL2FkZHlvc21h bmkuY29tL2Jsb2cvc2NyaXB0LXByaW9yaXRpZXMvIGZvciBDaHJvbWUgYmVoYXZpb3IuCisKKyAg ICAgICAgKiBiaW5kaW5ncy9qcy9DYWNoZWRTY3JpcHRGZXRjaGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNhY2hlZFNjcmlwdEZldGNoZXI6OnJlcXVlc3RNb2R1bGVTY3JpcHQgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkU2NyaXB0RmV0Y2hlcjo6cmVxdWVzdFNjcmlwdFdpdGhD YWNoZSBjb25zdCkKKworICAgICAgICBQYXNzIGFyb3VuZCB0aGUgcHJpb3JpdHkuCisKKyAgICAg ICAgKiBiaW5kaW5ncy9qcy9DYWNoZWRTY3JpcHRGZXRjaGVyLmg6CisgICAgICAgICogZG9tL0xv YWRhYmxlQ2xhc3NpY1NjcmlwdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMb2FkYWJsZUNsYXNz aWNTY3JpcHQ6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpMb2FkYWJsZUNsYXNzaWNTY3Jp cHQ6OmxvYWQpOgorCisgICAgICAgIERlcHJpb3JpdGl6ZSBhc3luYyBzY3JpcHQgbG9hZC4KKwor ICAgICAgICAqIGRvbS9Mb2FkYWJsZUNsYXNzaWNTY3JpcHQuaDoKKyAgICAgICAgKiBkb20vU2Ny aXB0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRFbGVtZW50OjpyZXF1ZXN0 Q2xhc3NpY1NjcmlwdCk6CisKKyAgICAgICAgUGFzcyBhcm91bmQgdGhlIGluZm9ybWF0aW9uIHRo YXQgdGhpcyBpcyBhbiBhc3luYyBzY3JpcHQuCisKKyAgICAgICAgKiBkb20vU2NyaXB0RWxlbWVu dENhY2hlZFNjcmlwdEZldGNoZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RWxlbWVu dENhY2hlZFNjcmlwdEZldGNoZXI6OnJlcXVlc3RNb2R1bGVTY3JpcHQgY29uc3QpOgorICAgICAg ICAqIGh0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpUb2tlblByZWxvYWRTY2FubmVyOjpTdGFydFRhZ1NjYW5uZXI6OmNyZWF0ZVByZWxvYWRSZXF1 ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlRva2VuUHJlbG9hZFNjYW5uZXI6OlN0YXJ0VGFnU2Nh bm5lcjo6cHJvY2Vzc0F0dHJpYnV0ZSk6CisKKyAgICAgICAgUGFyc2UgYXN5bmMgYXR0cmlidXRl IGluIHByZWxvYWQgc2Nhbm5lci4KKworICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxSZXNvdXJj ZVByZWxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcmVsb2FkUmVxdWVzdDo6cmVzb3Vy Y2VSZXF1ZXN0KToKKworICAgICAgICBEZXByaW9yaXRpemUgYXN5bmMgc2NyaXB0IHByZWxvYWQu CisKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MUmVzb3VyY2VQcmVsb2FkZXIuaDoKKyAgICAg ICAgKFdlYkNvcmU6OlByZWxvYWRSZXF1ZXN0OjpzZXRTY3JpcHRJc0FzeW5jKToKKwogMjAyMC0w Mi0yNiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBDcmVhdGUg QXVkaW9EZXN0aW5hdGlvbiBpbiB0aGUgR1BVIHByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0NhY2hlZFNjcmlwdEZldGNoZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvQ2FjaGVkU2NyaXB0RmV0Y2hlci5jcHAKaW5kZXggMjE4NmNmZjFjYTcu LmE0MzM3NTg2NWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9DYWNo ZWRTY3JpcHRGZXRjaGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9DYWNo ZWRTY3JpcHRGZXRjaGVyLmNwcApAQCAtNDIsMTAgKzQyLDEwIEBAIFJlZjxDYWNoZWRTY3JpcHRG ZXRjaGVyPiBDYWNoZWRTY3JpcHRGZXRjaGVyOjpjcmVhdGUoY29uc3QgU3RyaW5nJiBjaGFyc2V0 KQogCiBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRTY3JpcHQ+IENhY2hlZFNjcmlwdEZldGNo ZXI6OnJlcXVlc3RNb2R1bGVTY3JpcHQoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBVUkwmIHNv dXJjZVVSTCwgU3RyaW5nJiYgaW50ZWdyaXR5KSBjb25zdAogewotICAgIHJldHVybiByZXF1ZXN0 U2NyaXB0V2l0aENhY2hlKGRvY3VtZW50LCBzb3VyY2VVUkwsIFN0cmluZyB7IH0sIFdURk1vdmUo aW50ZWdyaXR5KSk7CisgICAgcmV0dXJuIHJlcXVlc3RTY3JpcHRXaXRoQ2FjaGUoZG9jdW1lbnQs IHNvdXJjZVVSTCwgU3RyaW5nIHsgfSwgV1RGTW92ZShpbnRlZ3JpdHkpLCB7IH0pOwogfQogCi1D YWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRTY3JpcHQ+IENhY2hlZFNjcmlwdEZldGNoZXI6OnJl cXVlc3RTY3JpcHRXaXRoQ2FjaGUoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBVUkwmIHNvdXJj ZVVSTCwgY29uc3QgU3RyaW5nJiBjcm9zc09yaWdpbk1vZGUsIFN0cmluZyYmIGludGVncml0eSkg Y29uc3QKK0NhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFNjcmlwdD4gQ2FjaGVkU2NyaXB0RmV0 Y2hlcjo6cmVxdWVzdFNjcmlwdFdpdGhDYWNoZShEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IFVS TCYgc291cmNlVVJMLCBjb25zdCBTdHJpbmcmIGNyb3NzT3JpZ2luTW9kZSwgU3RyaW5nJiYgaW50 ZWdyaXR5LCBPcHRpb25hbDxSZXNvdXJjZUxvYWRQcmlvcml0eT4gcmVzb3VyY2VMb2FkUHJpb3Jp dHkpIGNvbnN0CiB7CiAgICAgaWYgKCFkb2N1bWVudC5zZXR0aW5ncygpLmlzU2NyaXB0RW5hYmxl ZCgpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKQEAgLTYxLDggKzYxLDEwIEBAIENhY2hlZFJl c291cmNlSGFuZGxlPENhY2hlZFNjcmlwdD4gQ2FjaGVkU2NyaXB0RmV0Y2hlcjo6cmVxdWVzdFNj cmlwdFdpdGhDYWNoZShECiAgICAgYXV0byByZXF1ZXN0ID0gY3JlYXRlUG90ZW50aWFsQWNjZXNz Q29udHJvbFJlcXVlc3Qoc291cmNlVVJMLCBXVEZNb3ZlKG9wdGlvbnMpLCBkb2N1bWVudCwgY3Jv c3NPcmlnaW5Nb2RlKTsKICAgICByZXF1ZXN0LnVwZ3JhZGVJbnNlY3VyZVJlcXVlc3RJZk5lZWRl ZChkb2N1bWVudCk7CiAgICAgcmVxdWVzdC5zZXRDaGFyc2V0KG1fY2hhcnNldCk7CisgICAgcmVx dWVzdC5zZXRQcmlvcml0eShXVEZNb3ZlKHJlc291cmNlTG9hZFByaW9yaXR5KSk7CiAgICAgaWYg KCFtX2luaXRpYXRvck5hbWUuaXNOdWxsKCkpCiAgICAgICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9y KG1faW5pdGlhdG9yTmFtZSk7CisKICAgICByZXR1cm4gZG9jdW1lbnQuY2FjaGVkUmVzb3VyY2VM b2FkZXIoKS5yZXF1ZXN0U2NyaXB0KFdURk1vdmUocmVxdWVzdCkpLnZhbHVlX29yKG51bGxwdHIp OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9DYWNoZWRTY3Jp cHRGZXRjaGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9DYWNoZWRTY3JpcHRGZXRj aGVyLmgKaW5kZXggMWI4ODc2YTZhMTAuLjI5OTI4NGRjZmIwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9DYWNoZWRTY3JpcHRGZXRjaGVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvQ2FjaGVkU2NyaXB0RmV0Y2hlci5oCkBAIC0yNyw3ICsyNyw5IEBA CiAKICNpbmNsdWRlICJDYWNoZWRSZXNvdXJjZUhhbmRsZS5oIgogI2luY2x1ZGUgIlJlZmVycmVy UG9saWN5LmgiCisjaW5jbHVkZSAiUmVzb3VyY2VMb2FkUHJpb3JpdHkuaCIKICNpbmNsdWRlIDxK YXZhU2NyaXB0Q29yZS9TY3JpcHRGZXRjaGVyLmg+CisjaW5jbHVkZSA8d3RmL09wdGlvbmFsLmg+ CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK QEAgLTU2LDcgKzU4LDcgQEAgcHJvdGVjdGVkOgogICAgIHsKICAgICB9CiAKLSAgICBDYWNoZWRS ZXNvdXJjZUhhbmRsZTxDYWNoZWRTY3JpcHQ+IHJlcXVlc3RTY3JpcHRXaXRoQ2FjaGUoRG9jdW1l bnQmLCBjb25zdCBVUkwmIHNvdXJjZVVSTCwgY29uc3QgU3RyaW5nJiBjcm9zc09yaWdpbk1vZGUs IFN0cmluZyYmIGludGVncml0eSkgY29uc3Q7CisgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2Fj aGVkU2NyaXB0PiByZXF1ZXN0U2NyaXB0V2l0aENhY2hlKERvY3VtZW50JiwgY29uc3QgVVJMJiBz b3VyY2VVUkwsIGNvbnN0IFN0cmluZyYgY3Jvc3NPcmlnaW5Nb2RlLCBTdHJpbmcmJiBpbnRlZ3Jp dHksIE9wdGlvbmFsPFJlc291cmNlTG9hZFByaW9yaXR5PikgY29uc3Q7CiAKIHByaXZhdGU6CiAg ICAgU3RyaW5nIG1fbm9uY2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTG9hZGFi bGVDbGFzc2ljU2NyaXB0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Mb2FkYWJsZUNsYXNzaWNT Y3JpcHQuY3BwCmluZGV4IGNlMmY4ZjRhNTM1Li44YzEzNTMyZDY2NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZG9tL0xvYWRhYmxlQ2xhc3NpY1NjcmlwdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvZG9tL0xvYWRhYmxlQ2xhc3NpY1NjcmlwdC5jcHAKQEAgLTM1LDkgKzM1LDkgQEAKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCi1SZWY8TG9hZGFibGVDbGFzc2ljU2NyaXB0PiBMb2FkYWJs ZUNsYXNzaWNTY3JpcHQ6OmNyZWF0ZShjb25zdCBTdHJpbmcmIG5vbmNlLCBjb25zdCBTdHJpbmcm IGludGVncml0eU1ldGFkYXRhLCBSZWZlcnJlclBvbGljeSBwb2xpY3ksIGNvbnN0IFN0cmluZyYg Y3Jvc3NPcmlnaW5Nb2RlLCBjb25zdCBTdHJpbmcmIGNoYXJzZXQsIGNvbnN0IEF0b21TdHJpbmcm IGluaXRpYXRvck5hbWUsIGJvb2wgaXNJblVzZXJBZ2VudFNoYWRvd1RyZWUpCitSZWY8TG9hZGFi bGVDbGFzc2ljU2NyaXB0PiBMb2FkYWJsZUNsYXNzaWNTY3JpcHQ6OmNyZWF0ZShjb25zdCBTdHJp bmcmIG5vbmNlLCBjb25zdCBTdHJpbmcmIGludGVncml0eU1ldGFkYXRhLCBSZWZlcnJlclBvbGlj eSBwb2xpY3ksIGNvbnN0IFN0cmluZyYgY3Jvc3NPcmlnaW5Nb2RlLCBjb25zdCBTdHJpbmcmIGNo YXJzZXQsIGNvbnN0IEF0b21TdHJpbmcmIGluaXRpYXRvck5hbWUsIGJvb2wgaXNJblVzZXJBZ2Vu dFNoYWRvd1RyZWUsIGJvb2wgaXNBc3luYykKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBM b2FkYWJsZUNsYXNzaWNTY3JpcHQobm9uY2UsIGludGVncml0eU1ldGFkYXRhLCBwb2xpY3ksIGNy b3NzT3JpZ2luTW9kZSwgY2hhcnNldCwgaW5pdGlhdG9yTmFtZSwgaXNJblVzZXJBZ2VudFNoYWRv d1RyZWUpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBMb2FkYWJsZUNsYXNzaWNTY3JpcHQo bm9uY2UsIGludGVncml0eU1ldGFkYXRhLCBwb2xpY3ksIGNyb3NzT3JpZ2luTW9kZSwgY2hhcnNl dCwgaW5pdGlhdG9yTmFtZSwgaXNJblVzZXJBZ2VudFNoYWRvd1RyZWUsIGlzQXN5bmMpKTsKIH0K IAogTG9hZGFibGVDbGFzc2ljU2NyaXB0Ojp+TG9hZGFibGVDbGFzc2ljU2NyaXB0KCkKQEAgLTEy Niw3ICsxMjYsMTUgQEAgdm9pZCBMb2FkYWJsZUNsYXNzaWNTY3JpcHQ6OmV4ZWN1dGUoU2NyaXB0 RWxlbWVudCYgc2NyaXB0RWxlbWVudCkKIGJvb2wgTG9hZGFibGVDbGFzc2ljU2NyaXB0Ojpsb2Fk KERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgVVJMJiBzb3VyY2VVUkwpCiB7CiAgICAgQVNTRVJU KCFtX2NhY2hlZFNjcmlwdCk7Ci0gICAgbV9jYWNoZWRTY3JpcHQgPSByZXF1ZXN0U2NyaXB0V2l0 aENhY2hlKGRvY3VtZW50LCBzb3VyY2VVUkwsIGNyb3NzT3JpZ2luTW9kZSgpLCBTdHJpbmcgeyBt X2ludGVncml0eSB9KTsKKworICAgIGF1dG8gcHJpb3JpdHkgPSBbJl0oKSAtPiBPcHRpb25hbDxS ZXNvdXJjZUxvYWRQcmlvcml0eT4geworICAgICAgICBpZiAobV9pc0FzeW5jKQorICAgICAgICAg ICAgcmV0dXJuIFJlc291cmNlTG9hZFByaW9yaXR5OjpMb3c7CisgICAgICAgIC8vIFVzZSBkZWZh dWx0LgorICAgICAgICByZXR1cm4geyB9OworICAgIH07CisKKyAgICBtX2NhY2hlZFNjcmlwdCA9 IHJlcXVlc3RTY3JpcHRXaXRoQ2FjaGUoZG9jdW1lbnQsIHNvdXJjZVVSTCwgY3Jvc3NPcmlnaW5N b2RlKCksIFN0cmluZyB7IG1faW50ZWdyaXR5IH0sIHByaW9yaXR5KCkpOwogICAgIGlmICghbV9j YWNoZWRTY3JpcHQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBtX2NhY2hlZFNjcmlwdC0+ YWRkQ2xpZW50KCp0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Mb2FkYWJs ZUNsYXNzaWNTY3JpcHQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Mb2FkYWJsZUNsYXNzaWNTY3Jp cHQuaAppbmRleCAwNGM3MTE5MDQ5Mi4uZTVmNWFjMWQ3YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9Mb2FkYWJsZUNsYXNzaWNTY3JpcHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vTG9hZGFibGVDbGFzc2ljU2NyaXB0LmgKQEAgLTQxLDcgKzQxLDcgQEAgY2xhc3MgTG9hZGFi bGVDbGFzc2ljU2NyaXB0IGZpbmFsIDogcHVibGljIExvYWRhYmxlU2NyaXB0LCBwcml2YXRlIENh Y2hlZFJlc291cmMKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5Mb2FkYWJsZUNsYXNzaWNTY3JpcHQo KTsKIAotICAgIHN0YXRpYyBSZWY8TG9hZGFibGVDbGFzc2ljU2NyaXB0PiBjcmVhdGUoY29uc3Qg U3RyaW5nJiBub25jZSwgY29uc3QgU3RyaW5nJiBpbnRlZ3JpdHksIFJlZmVycmVyUG9saWN5LCBj b25zdCBTdHJpbmcmIGNyb3NzT3JpZ2luTW9kZSwgY29uc3QgU3RyaW5nJiBjaGFyc2V0LCBjb25z dCBBdG9tU3RyaW5nJiBpbml0aWF0b3JOYW1lLCBib29sIGlzSW5Vc2VyQWdlbnRTaGFkb3dUcmVl KTsKKyAgICBzdGF0aWMgUmVmPExvYWRhYmxlQ2xhc3NpY1NjcmlwdD4gY3JlYXRlKGNvbnN0IFN0 cmluZyYgbm9uY2UsIGNvbnN0IFN0cmluZyYgaW50ZWdyaXR5LCBSZWZlcnJlclBvbGljeSwgY29u c3QgU3RyaW5nJiBjcm9zc09yaWdpbk1vZGUsIGNvbnN0IFN0cmluZyYgY2hhcnNldCwgY29uc3Qg QXRvbVN0cmluZyYgaW5pdGlhdG9yTmFtZSwgYm9vbCBpc0luVXNlckFnZW50U2hhZG93VHJlZSwg Ym9vbCBpc0FzeW5jKTsKICAgICBib29sIGlzTG9hZGVkKCkgY29uc3QgZmluYWw7CiAgICAgT3B0 aW9uYWw8RXJyb3I+IGVycm9yKCkgY29uc3QgZmluYWw7CiAgICAgYm9vbCB3YXNDYW5jZWxlZCgp IGNvbnN0IGZpbmFsOwpAQCAtNTYsOSArNTYsMTAgQEAgcHVibGljOgogICAgIGJvb2wgbG9hZChE b2N1bWVudCYsIGNvbnN0IFVSTCYpOwogCiBwcml2YXRlOgotICAgIExvYWRhYmxlQ2xhc3NpY1Nj cmlwdChjb25zdCBTdHJpbmcmIG5vbmNlLCBjb25zdCBTdHJpbmcmIGludGVncml0eSwgUmVmZXJy ZXJQb2xpY3kgcG9saWN5LCBjb25zdCBTdHJpbmcmIGNyb3NzT3JpZ2luTW9kZSwgY29uc3QgU3Ry aW5nJiBjaGFyc2V0LCBjb25zdCBBdG9tU3RyaW5nJiBpbml0aWF0b3JOYW1lLCBib29sIGlzSW5V c2VyQWdlbnRTaGFkb3dUcmVlKQorICAgIExvYWRhYmxlQ2xhc3NpY1NjcmlwdChjb25zdCBTdHJp bmcmIG5vbmNlLCBjb25zdCBTdHJpbmcmIGludGVncml0eSwgUmVmZXJyZXJQb2xpY3kgcG9saWN5 LCBjb25zdCBTdHJpbmcmIGNyb3NzT3JpZ2luTW9kZSwgY29uc3QgU3RyaW5nJiBjaGFyc2V0LCBj b25zdCBBdG9tU3RyaW5nJiBpbml0aWF0b3JOYW1lLCBib29sIGlzSW5Vc2VyQWdlbnRTaGFkb3dU cmVlLCBib29sIGlzQXN5bmMpCiAgICAgICAgIDogTG9hZGFibGVTY3JpcHQobm9uY2UsIHBvbGlj eSwgY3Jvc3NPcmlnaW5Nb2RlLCBjaGFyc2V0LCBpbml0aWF0b3JOYW1lLCBpc0luVXNlckFnZW50 U2hhZG93VHJlZSkKICAgICAgICAgLCBtX2ludGVncml0eShpbnRlZ3JpdHkpCisgICAgICAgICwg bV9pc0FzeW5jKGlzQXN5bmMpCiAgICAgewogICAgIH0KIApAQCAtNjcsNiArNjgsNyBAQCBwcml2 YXRlOgogICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFNjcmlwdD4gbV9jYWNoZWRTY3Jp cHQgeyB9OwogICAgIE9wdGlvbmFsPEVycm9yPiBtX2Vycm9yIHsgV1RGOjpudWxsb3B0IH07CiAg ICAgU3RyaW5nIG1faW50ZWdyaXR5OworICAgIGJvb2wgbV9pc0FzeW5jIHsgZmFsc2UgfTsKIH07 CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFbGVtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFbGVtZW50LmNwcAppbmRleCBiYjhkYTk2MmUxNC4u OGUxMDZlMWY5ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFbGVtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RWxlbWVudC5jcHAKQEAgLTI4OSwx MCArMjg5LDEyIEBAIGJvb2wgU2NyaXB0RWxlbWVudDo6cmVxdWVzdENsYXNzaWNTY3JpcHQoY29u c3QgU3RyaW5nJiBzb3VyY2VVUkwpCiAgICAgICAgICAgICBtX2VsZW1lbnQuYXR0cmlidXRlV2l0 aG91dFN5bmNocm9uaXphdGlvbihIVE1MTmFtZXM6OmNyb3Nzb3JpZ2luQXR0ciksCiAgICAgICAg ICAgICBzY3JpcHRDaGFyc2V0KCksCiAgICAgICAgICAgICBtX2VsZW1lbnQubG9jYWxOYW1lKCks Ci0gICAgICAgICAgICBtX2VsZW1lbnQuaXNJblVzZXJBZ2VudFNoYWRvd1RyZWUoKSk7CisgICAg ICAgICAgICBtX2VsZW1lbnQuaXNJblVzZXJBZ2VudFNoYWRvd1RyZWUoKSwKKyAgICAgICAgICAg IGhhc0FzeW5jQXR0cmlidXRlKCkpOwogCiAgICAgICAgIGF1dG8gc2NyaXB0VVJMID0gbV9lbGVt ZW50LmRvY3VtZW50KCkuY29tcGxldGVVUkwoc291cmNlVVJMKTsKICAgICAgICAgbV9lbGVtZW50 LmRvY3VtZW50KCkud2lsbExvYWRTY3JpcHRFbGVtZW50KHNjcmlwdFVSTCk7CisKICAgICAgICAg aWYgKHNjcmlwdC0+bG9hZChtX2VsZW1lbnQuZG9jdW1lbnQoKSwgc2NyaXB0VVJMKSkgewogICAg ICAgICAgICAgbV9sb2FkYWJsZVNjcmlwdCA9IFdURk1vdmUoc2NyaXB0KTsKICAgICAgICAgICAg IG1faXNFeHRlcm5hbFNjcmlwdCA9IHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k b20vU2NyaXB0RWxlbWVudENhY2hlZFNjcmlwdEZldGNoZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv ZG9tL1NjcmlwdEVsZW1lbnRDYWNoZWRTY3JpcHRGZXRjaGVyLmNwcAppbmRleCA4NDNkYTIwMzEy My4uZWFkZGI3NDk0YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFbGVt ZW50Q2FjaGVkU2NyaXB0RmV0Y2hlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1Njcmlw dEVsZW1lbnRDYWNoZWRTY3JpcHRGZXRjaGVyLmNwcApAQCAtMzYsNyArMzYsNyBAQCBDYWNoZWRS ZXNvdXJjZUhhbmRsZTxDYWNoZWRTY3JpcHQ+IFNjcmlwdEVsZW1lbnRDYWNoZWRTY3JpcHRGZXRj aGVyOjpyZXF1ZXN0TW9kdQogICAgIC8vIGh0dHBzOi8vZ2l0aHViLmNvbS90YzM5L3Byb3Bvc2Fs LWR5bmFtaWMtaW1wb3J0L2Jsb2IvbWFzdGVyL0hUTUwgSW50ZWdyYXRpb24ubWQKICAgICAvLyBJ ZiB0aGUgZmV0Y2hlciBpcyBub3QgbW9kdWxlIHNjcmlwdCwgY3JlZGVudGlhbCBtb2RlIGlzIGFs d2F5cyAib21pdCIuCiAKLSAgICByZXR1cm4gcmVxdWVzdFNjcmlwdFdpdGhDYWNoZShkb2N1bWVu dCwgc291cmNlVVJMLCBpc0NsYXNzaWNTY3JpcHQoKSA/ICJvbWl0Il9zIDogbV9jcm9zc09yaWdp bk1vZGUsIFdURk1vdmUoaW50ZWdyaXR5KSk7CisgICAgcmV0dXJuIHJlcXVlc3RTY3JpcHRXaXRo Q2FjaGUoZG9jdW1lbnQsIHNvdXJjZVVSTCwgaXNDbGFzc2ljU2NyaXB0KCkgPyAib21pdCJfcyA6 IG1fY3Jvc3NPcmlnaW5Nb2RlLCBXVEZNb3ZlKGludGVncml0eSksIHsgfSk7CiB9CiAKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIuY3BwCmlu ZGV4IDU0OTUwMGIxMTU0Li4zYWIxM2NmM2MyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvSFRNTFByZWxvYWRTY2FubmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIuY3BwCkBAIC0xNzEsNiArMTcxLDcgQEAgcHVi bGljOgogICAgICAgICBhdXRvIHJlcXVlc3QgPSBtYWtlVW5pcXVlPFByZWxvYWRSZXF1ZXN0Pihp bml0aWF0b3JGb3IobV90YWdJZCksIG1fdXJsVG9Mb2FkLCBwcmVkaWN0ZWRCYXNlVVJMLCB0eXBl LnZhbHVlKCksIG1fbWVkaWFBdHRyaWJ1dGUsIG1fbW9kdWxlU2NyaXB0LCBtX3JlZmVycmVyUG9s aWN5KTsKICAgICAgICAgcmVxdWVzdC0+c2V0Q3Jvc3NPcmlnaW5Nb2RlKG1fY3Jvc3NPcmlnaW5N b2RlKTsKICAgICAgICAgcmVxdWVzdC0+c2V0Tm9uY2UobV9ub25jZUF0dHJpYnV0ZSk7CisgICAg ICAgIHJlcXVlc3QtPnNldFNjcmlwdElzQXN5bmMobV9zY3JpcHRJc0FzeW5jKTsKIAogICAgICAg ICAvLyBBY2NvcmRpbmcgdG8gdGhlIHNwZWMsIHRoZSBtb2R1bGUgdGFnIGlnbm9yZXMgdGhlICJj aGFyc2V0IiBhdHRyaWJ1dGUgYXMgdGhlIHNhbWUgdG8gdGhlIHdvcmtlcidzCiAgICAgICAgIC8v IGltcG9ydFNjcmlwdC4gQnV0IFdlYktpdCBzdXBwb3J0cyB0aGUgImNoYXJzZXQiIGZvciBpbXBv cnRTY3JpcHQgaW50ZW50aW9uYWxseS4gU28gdG8gYmUgY29uc2lzdGVudCwKQEAgLTI1OCw2ICsy NTksOSBAQCBwcml2YXRlOgogICAgICAgICAgICAgfSBlbHNlIGlmIChtYXRjaChhdHRyaWJ1dGVO YW1lLCBub21vZHVsZUF0dHIpKSB7CiAgICAgICAgICAgICAgICAgbV9zY3JpcHRJc05vbW9kdWxl ID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAo bWF0Y2goYXR0cmlidXRlTmFtZSwgYXN5bmNBdHRyKSkgeworICAgICAgICAgICAgICAgIG1fc2Ny aXB0SXNBc3luYyA9IHRydWU7CisgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9 CiAgICAgICAgICAgICBwcm9jZXNzSW1hZ2VBbmRTY3JpcHRBdHRyaWJ1dGUoYXR0cmlidXRlTmFt ZSwgYXR0cmlidXRlVmFsdWUpOwogICAgICAgICAgICAgYnJlYWs7CkBAIC0zOTQsNiArMzk4LDcg QEAgcHJpdmF0ZToKICAgICBib29sIG1fbWV0YUlzRGlzYWJsZWRBZGFwdGF0aW9uczsKICAgICBi b29sIG1faW5wdXRJc0ltYWdlOwogICAgIGJvb2wgbV9zY3JpcHRJc05vbW9kdWxlIHsgZmFsc2Ug fTsKKyAgICBib29sIG1fc2NyaXB0SXNBc3luYyB7IGZhbHNlIH07CiAgICAgZmxvYXQgbV9kZXZp Y2VTY2FsZUZhY3RvcjsKICAgICBQcmVsb2FkUmVxdWVzdDo6TW9kdWxlU2NyaXB0IG1fbW9kdWxl U2NyaXB0IHsgUHJlbG9hZFJlcXVlc3Q6Ok1vZHVsZVNjcmlwdDo6Tm8gfTsKICAgICBSZWZlcnJl clBvbGljeSBtX3JlZmVycmVyUG9saWN5IHsgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUmVzb3VyY2VQcmVs b2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFJlc291cmNlUHJlbG9h ZGVyLmNwcAppbmRleCA3OWE4MmYzNTQyMS4uM2E5NjUxNTI2NjYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxSZXNvdXJjZVByZWxvYWRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFJlc291cmNlUHJlbG9hZGVyLmNwcApAQCAtNjMs NiArNjMsMTEgQEAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IFByZWxvYWRSZXF1ZXN0OjpyZXNvdXJj ZVJlcXVlc3QoRG9jdW1lbnQmIGRvY3VtZW50KQogICAgICAgICBvcHRpb25zLnJlZmVycmVyUG9s aWN5ID0gbV9yZWZlcnJlclBvbGljeTsKICAgICBhdXRvIHJlcXVlc3QgPSBjcmVhdGVQb3RlbnRp YWxBY2Nlc3NDb250cm9sUmVxdWVzdChjb21wbGV0ZVVSTChkb2N1bWVudCksIFdURk1vdmUob3B0 aW9ucyksIGRvY3VtZW50LCBjcm9zc09yaWdpbk1vZGUpOwogICAgIHJlcXVlc3Quc2V0SW5pdGlh dG9yKG1faW5pdGlhdG9yKTsKKworICAgIC8vIEZJWE1FOiBQdXQgcHJpb3JpdGllcyBmb3IgdmFy aW91cyBjYXNlcyB0byBzb21lIGNlbnRyYWwgcGxhY2Ugd2hlcmUgdGhleSBhcmUgZWFzeSB0byBz ZWUuCisgICAgaWYgKG1fc2NyaXB0SXNBc3luYyAmJiBtX3Jlc291cmNlVHlwZSA9PSBDYWNoZWRS ZXNvdXJjZTo6VHlwZTo6U2NyaXB0ICYmIG1fbW9kdWxlU2NyaXB0ID09IE1vZHVsZVNjcmlwdDo6 Tm8pCisgICAgICAgIHJlcXVlc3Quc2V0UHJpb3JpdHkoUmVzb3VyY2VMb2FkUHJpb3JpdHk6Okxv dyk7CisKICAgICByZXR1cm4gcmVxdWVzdDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvSFRNTFJlc291cmNlUHJlbG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL3BhcnNlci9IVE1MUmVzb3VyY2VQcmVsb2FkZXIuaAppbmRleCA0NTczNWE2Yjc5NS4uOWM0 NDYxODkxMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxSZXNv dXJjZVByZWxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxSZXNv dXJjZVByZWxvYWRlci5oCkBAIC01NSw2ICs1NSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldENo YXJzZXQoY29uc3QgU3RyaW5nJiBjaGFyc2V0KSB7IG1fY2hhcnNldCA9IGNoYXJzZXQuaXNvbGF0 ZWRDb3B5KCk7IH0KICAgICB2b2lkIHNldENyb3NzT3JpZ2luTW9kZShjb25zdCBTdHJpbmcmIG1v ZGUpIHsgbV9jcm9zc09yaWdpbk1vZGUgPSBtb2RlOyB9CiAgICAgdm9pZCBzZXROb25jZShjb25z dCBTdHJpbmcmIG5vbmNlKSB7IG1fbm9uY2VBdHRyaWJ1dGUgPSBub25jZTsgfQorICAgIHZvaWQg c2V0U2NyaXB0SXNBc3luYyhib29sIHZhbHVlKSB7IG1fc2NyaXB0SXNBc3luYyA9IHZhbHVlOyB9 CiAgICAgQ2FjaGVkUmVzb3VyY2U6OlR5cGUgcmVzb3VyY2VUeXBlKCkgY29uc3QgeyByZXR1cm4g bV9yZXNvdXJjZVR5cGU7IH0KIAogcHJpdmF0ZToKQEAgLTY4LDYgKzY5LDcgQEAgcHJpdmF0ZToK ICAgICBTdHJpbmcgbV9tZWRpYUF0dHJpYnV0ZTsKICAgICBTdHJpbmcgbV9jcm9zc09yaWdpbk1v ZGU7CiAgICAgU3RyaW5nIG1fbm9uY2VBdHRyaWJ1dGU7CisgICAgYm9vbCBtX3NjcmlwdElzQXN5 bmMgeyBmYWxzZSB9OwogICAgIE1vZHVsZVNjcmlwdCBtX21vZHVsZVNjcmlwdDsKICAgICBSZWZl cnJlclBvbGljeSBtX3JlZmVycmVyUG9saWN5OwogfTsK