30131 2009-10-06 09:42:18 -0700 Make beforeload work with script elements 2009-10-06 10:38:11 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hyatt hyatt oldest_to_newest 152758 0 hyatt 2009-10-06 09:42:18 -0700 This patch makes the beforeload event fire on script elements. 152759 1 40727 hyatt 2009-10-06 09:45:41 -0700 Created attachment 40727 Patch 152770 2 40727 aroben 2009-10-06 10:02:53 -0700 Comment on attachment 40727 Patch > +++ WebCore/dom/ScriptElement.h (working copy) > @@ -44,9 +44,10 @@ public: > virtual String languageAttributeValue() const = 0; > virtual String forAttributeValue() const = 0; > > + virtual bool dispatchBeforeLoadEvent(const String& sourceURL) = 0; > virtual void dispatchLoadEvent() = 0; > virtual void dispatchErrorEvent() = 0; > - > + Unneeded whitespace change here. I think you could share the dispatchBeforeLoadEvent implementation by making it a static protected helper function on ScriptElement. r=me 152783 3 hyatt 2009-10-06 10:38:11 -0700 Fixed in r49194. 40727 2009-10-06 09:45:41 -0700 2009-10-06 10:02:53 -0700 Patch patch.txt text/plain 13621 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0OTE5MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMDktMTAtMDYgIERhdmUgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMTMxLCBtYWtlIGJlZm9yZWxvYWQg ZmlyZSBvbiBzY3JpcHQgZWxlbWVudHMuCisKKyAgICAgICAgQWRkZWQgdGVzdHMgaW4gZmFzdC9k b20vYmVmb3JlbG9hZC8uCisKKyAgICAgICAgKiBkb20vU2NyaXB0RWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTY3JpcHRFbGVtZW50RGF0YTo6cmVxdWVzdFNjcmlwdCk6CisgICAgICAg ICogZG9tL1NjcmlwdEVsZW1lbnQuaDoKKyAgICAgICAgKiBkb20vWE1MVG9rZW5pemVyTGlieG1s Mi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYTUxUb2tlbml6ZXI6OmVuZEVsZW1lbnROcyk6Cisg ICAgICAgICogaHRtbC9IVE1MQXR0cmlidXRlTmFtZXMuaW46CisgICAgICAgICogaHRtbC9IVE1M U2NyaXB0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU2NyaXB0RWxlbWVudDo6 cGFyc2VNYXBwZWRBdHRyaWJ1dGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNjcmlwdEVsZW1l bnQ6OmRpc3BhdGNoQmVmb3JlTG9hZEV2ZW50KToKKyAgICAgICAgKiBodG1sL0hUTUxTY3JpcHRF bGVtZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MVG9rZW5pemVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxUb2tlbml6ZXI6OnNjcmlwdEhhbmRsZXIpOgorICAgICAgICAqIHN2Zy9TVkdT Y3JpcHRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1NjcmlwdEVsZW1lbnQ6OmRp c3BhdGNoQmVmb3JlTG9hZEV2ZW50KToKKyAgICAgICAgKiBzdmcvU1ZHU2NyaXB0RWxlbWVudC5o OgorCiAyMDA5LTEwLTA2ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KSW5kZXg6IFdlYkNvcmUvZG9t L1NjcmlwdEVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL1NjcmlwdEVsZW1l bnQuY3BwCShyZXZpc2lvbiA0OTExMikKKysrIFdlYkNvcmUvZG9tL1NjcmlwdEVsZW1lbnQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xNTEsNiArMTUxLDkgQEAgdm9pZCBTY3JpcHRFbGVtZW50RGF0 YTo6cmVxdWVzdFNjcmlwdChjbwogICAgIGlmICghZG9jdW1lbnQtPmZyYW1lKCkpCiAgICAgICAg IHJldHVybjsKIAorICAgIGlmICghbV9zY3JpcHRFbGVtZW50LT5kaXNwYXRjaEJlZm9yZUxvYWRF dmVudChzb3VyY2VVcmwpKQorICAgICAgICByZXR1cm47CisKICAgICBBU1NFUlQoIW1fY2FjaGVk U2NyaXB0KTsKICAgICBtX2NhY2hlZFNjcmlwdCA9IGRvY3VtZW50LT5kb2NMb2FkZXIoKS0+cmVx dWVzdFNjcmlwdChzb3VyY2VVcmwsIHNjcmlwdENoYXJzZXQoKSk7CiAgICAgbV9yZXF1ZXN0ZWQg PSB0cnVlOwpJbmRleDogV2ViQ29yZS9kb20vU2NyaXB0RWxlbWVudC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvZG9tL1NjcmlwdEVsZW1lbnQuaAkocmV2aXNpb24gNDkxMTIpCisrKyBXZWJDb3Jl L2RvbS9TY3JpcHRFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDkgKzQ0LDEwIEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIFN0cmluZyBsYW5ndWFnZUF0dHJpYnV0ZVZhbHVlKCkgY29uc3Qg PSAwOwogICAgIHZpcnR1YWwgU3RyaW5nIGZvckF0dHJpYnV0ZVZhbHVlKCkgY29uc3QgPSAwOwog CisgICAgdmlydHVhbCBib29sIGRpc3BhdGNoQmVmb3JlTG9hZEV2ZW50KGNvbnN0IFN0cmluZyYg c291cmNlVVJMKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoTG9hZEV2ZW50KCkgPSAw OwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaEVycm9yRXZlbnQoKSA9IDA7Ci0KKyAgICAKICAg ICAvLyBBIGNoYXJzZXQgZm9yIGxvYWRpbmcgdGhlIHNjcmlwdCAobWF5IGJlIG92ZXJyaWRkZW4g YnkgSFRUUCBoZWFkZXJzIG9yIGEgQk9NKS4KICAgICB2aXJ0dWFsIFN0cmluZyBzY3JpcHRDaGFy c2V0KCkgY29uc3QgPSAwOwogCkluZGV4OiBXZWJDb3JlL2RvbS9YTUxUb2tlbml6ZXJMaWJ4bWwy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9YTUxUb2tlbml6ZXJMaWJ4bWwyLmNwcAko cmV2aXNpb24gNDkxMTIpCisrKyBXZWJDb3JlL2RvbS9YTUxUb2tlbml6ZXJMaWJ4bWwyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtODUxLDcgKzg1MSw4IEBAIHZvaWQgWE1MVG9rZW5pemVyOjplbmRF bGVtZW50TnMoKQogICAgICAgICBpZiAoIXNjcmlwdEhyZWYuaXNFbXB0eSgpKSB7CiAgICAgICAg ICAgICAvLyB3ZSBoYXZlIGEgc3JjIGF0dHJpYnV0ZSAKICAgICAgICAgICAgIFN0cmluZyBzY3Jp cHRDaGFyc2V0ID0gc2NyaXB0RWxlbWVudC0+c2NyaXB0Q2hhcnNldCgpOwotICAgICAgICAgICAg aWYgKChtX3BlbmRpbmdTY3JpcHQgPSBtX2RvYy0+ZG9jTG9hZGVyKCktPnJlcXVlc3RTY3JpcHQo c2NyaXB0SHJlZiwgc2NyaXB0Q2hhcnNldCkpKSB7CisgICAgICAgICAgICBpZiAoc2NyaXB0RWxl bWVudC0+ZGlzcGF0Y2hCZWZvcmVMb2FkRXZlbnQoc2NyaXB0SHJlZikgJiYKKyAgICAgICAgICAg ICAgICAobV9wZW5kaW5nU2NyaXB0ID0gbV9kb2MtPmRvY0xvYWRlcigpLT5yZXF1ZXN0U2NyaXB0 KHNjcmlwdEhyZWYsIHNjcmlwdENoYXJzZXQpKSkgewogICAgICAgICAgICAgICAgIG1fc2NyaXB0 RWxlbWVudCA9IGVsZW1lbnQ7CiAgICAgICAgICAgICAgICAgbV9wZW5kaW5nU2NyaXB0LT5hZGRD bGllbnQodGhpcyk7CiAKSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MQXR0cmlidXRlTmFtZXMuaW4K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxBdHRyaWJ1dGVOYW1lcy5pbgkocmV2aXNp b24gNDkxMTIpCisrKyBXZWJDb3JlL2h0bWwvSFRNTEF0dHJpYnV0ZU5hbWVzLmluCSh3b3JraW5n IGNvcHkpCkBAIC0xMjUsNiArMTI1LDcgQEAgb2JqZWN0CiBvbmFib3J0CiBvbmJlZm9yZWNvcHkK IG9uYmVmb3JlY3V0CitvbmJlZm9yZWxvYWQKIG9uYmVmb3JlcGFzdGUKIG9uYmVmb3JldW5sb2Fk CiBvbmJsdXIKSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MU2NyaXB0RWxlbWVudC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxTY3JpcHRFbGVtZW50LmNwcAkocmV2aXNpb24gNDkx MTIpCisrKyBXZWJDb3JlL2h0bWwvSFRNTFNjcmlwdEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yMyw2ICsyMyw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSFRNTFNj cmlwdEVsZW1lbnQuaCIKIAorI2luY2x1ZGUgIkJlZm9yZUxvYWRFdmVudC5oIgogI2luY2x1ZGUg IkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRXZlbnQuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgi CkBAIC03MSw2ICs3Miw4IEBAIHZvaWQgSFRNTFNjcmlwdEVsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0 cmkKICAgICAgICAgaGFuZGxlU291cmNlQXR0cmlidXRlKG1fZGF0YSwgYXR0ci0+dmFsdWUoKSk7 CiAgICAgZWxzZSBpZiAoYXR0ck5hbWUgPT0gb25sb2FkQXR0cikKICAgICAgICAgc2V0QXR0cmli dXRlRXZlbnRMaXN0ZW5lcihldmVudE5hbWVzKCkubG9hZEV2ZW50LCBjcmVhdGVBdHRyaWJ1dGVF dmVudExpc3RlbmVyKHRoaXMsIGF0dHIpKTsKKyAgICBlbHNlIGlmIChhdHRyTmFtZSA9PSBvbmJl Zm9yZWxvYWRBdHRyKQorICAgICAgICBzZXRBdHRyaWJ1dGVFdmVudExpc3RlbmVyKGV2ZW50TmFt ZXMoKS5iZWZvcmVsb2FkRXZlbnQsIGNyZWF0ZUF0dHJpYnV0ZUV2ZW50TGlzdGVuZXIodGhpcywg YXR0cikpOwogICAgIGVsc2UKICAgICAgICAgSFRNTEVsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmli dXRlKGF0dHIpOwogfQpAQCAtMjE4LDYgKzIyMSwxNCBAQCBTdHJpbmcgSFRNTFNjcmlwdEVsZW1l bnQ6OmZvckF0dHJpYnV0ZVZhCiAgICAgcmV0dXJuIGdldEF0dHJpYnV0ZShmb3JBdHRyKS5zdHJp bmcoKTsKIH0KICAKK2Jvb2wgSFRNTFNjcmlwdEVsZW1lbnQ6OmRpc3BhdGNoQmVmb3JlTG9hZEV2 ZW50KGNvbnN0IFN0cmluZyYgc291cmNlVVJMKQoreworICAgIFJlZlB0cjxIVE1MU2NyaXB0RWxl bWVudD4gcHJvdGVjdG9yKHRoaXMpOworICAgIFJlZlB0cjxCZWZvcmVMb2FkRXZlbnQ+IGJlZm9y ZUxvYWRFdmVudCA9IEJlZm9yZUxvYWRFdmVudDo6Y3JlYXRlKHNvdXJjZVVSTCk7CisgICAgZGlz cGF0Y2hFdmVudChiZWZvcmVMb2FkRXZlbnQuZ2V0KCkpOworICAgIHJldHVybiBpbkRvY3VtZW50 KCkgJiYgIWJlZm9yZUxvYWRFdmVudC0+ZGVmYXVsdFByZXZlbnRlZCgpOworfQorCiB2b2lkIEhU TUxTY3JpcHRFbGVtZW50OjpkaXNwYXRjaExvYWRFdmVudCgpCiB7CiAgICAgQVNTRVJUKCFtX2Rh dGEuaGF2ZUZpcmVkTG9hZEV2ZW50KCkpOwpJbmRleDogV2ViQ29yZS9odG1sL0hUTUxTY3JpcHRF bGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxTY3JpcHRFbGVtZW50LmgJ KHJldmlzaW9uIDQ5MTEyKQorKysgV2ViQ29yZS9odG1sL0hUTUxTY3JpcHRFbGVtZW50LmgJKHdv cmtpbmcgY29weSkKQEAgLTc3LDYgKzc3LDggQEAgcHVibGljOgogCiAgICAgYm9vbCBoYXZlRmly ZWRMb2FkRXZlbnQoKSBjb25zdCB7IHJldHVybiBtX2RhdGEuaGF2ZUZpcmVkTG9hZEV2ZW50KCk7 IH0KIAorICAgIHZpcnR1YWwgYm9vbCBkaXNwYXRjaEJlZm9yZUxvYWRFdmVudChjb25zdCBTdHJp bmcmIHNvdXJjZVVSTCk7CisKIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIFN0cmluZyBzb3VyY2VB dHRyaWJ1dGVWYWx1ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgU3RyaW5nIGNoYXJzZXRBdHRyaWJ1 dGVWYWx1ZSgpIGNvbnN0OwpJbmRleDogV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmNwcAkocmV2aXNpb24gNDkx MTIpCisrKyBXZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQ0MSw3ICs0NDEsOCBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpzY3Jp CiAjZW5kaWYKICAgICAgICAgICAgICAgICAvLyBUaGUgcGFyc2VyIG1pZ2h0IGhhdmUgYmVlbiBz dG9wcGVkIGJ5IGZvciBleGFtcGxlIGEgd2luZG93LmNsb3NlIGNhbGwgaW4gYW4gZWFybGllciBz Y3JpcHQuCiAgICAgICAgICAgICAgICAgLy8gSWYgc28sIHdlIGRvbid0IHdhbnQgdG8gbG9hZCBz Y3JpcHRzLgotICAgICAgICAgICAgICAgIGlmICghbV9wYXJzZXJTdG9wcGVkICYmIChjcyA9IG1f ZG9jLT5kb2NMb2FkZXIoKS0+cmVxdWVzdFNjcmlwdChtX3NjcmlwdFRhZ1NyY0F0dHJWYWx1ZSwg bV9zY3JpcHRUYWdDaGFyc2V0QXR0clZhbHVlKSkpCisgICAgICAgICAgICAgICAgaWYgKCFtX3Bh cnNlclN0b3BwZWQgJiYgbV9zY3JpcHROb2RlLT5kaXNwYXRjaEJlZm9yZUxvYWRFdmVudChtX3Nj cmlwdFRhZ1NyY0F0dHJWYWx1ZSkgJiYKKyAgICAgICAgICAgICAgICAgICAgKGNzID0gbV9kb2Mt PmRvY0xvYWRlcigpLT5yZXF1ZXN0U2NyaXB0KG1fc2NyaXB0VGFnU3JjQXR0clZhbHVlLCBtX3Nj cmlwdFRhZ0NoYXJzZXRBdHRyVmFsdWUpKSkKICAgICAgICAgICAgICAgICAgICAgbV9wZW5kaW5n U2NyaXB0cy5hcHBlbmQoY3MpOwogICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAg ICAgICAgbV9zY3JpcHROb2RlID0gMDsKSW5kZXg6IFdlYkNvcmUvc3ZnL1NWR1NjcmlwdEVsZW1l bnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3ZnL1NWR1NjcmlwdEVsZW1lbnQuY3BwCShy ZXZpc2lvbiA0OTExMikKKysrIFdlYkNvcmUvc3ZnL1NWR1NjcmlwdEVsZW1lbnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNSw2ICsyNSw3IEBACiAjaWYgRU5BQkxFKFNWRykKICNpbmNsdWRlICJT VkdTY3JpcHRFbGVtZW50LmgiCiAKKyNpbmNsdWRlICJCZWZvcmVMb2FkRXZlbnQuaCIKICNpbmNs dWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAiRXZlbnROYW1l cy5oIgpAQCAtMTgwLDYgKzE4MSwxNCBAQCBTdHJpbmcgU1ZHU2NyaXB0RWxlbWVudDo6Zm9yQXR0 cmlidXRlVmFsCiAgICAgcmV0dXJuIFN0cmluZygpOwogfQogCitib29sIFNWR1NjcmlwdEVsZW1l bnQ6OmRpc3BhdGNoQmVmb3JlTG9hZEV2ZW50KGNvbnN0IFN0cmluZyYgc291cmNlVVJMKQorewor ICAgIFJlZlB0cjxTVkdTY3JpcHRFbGVtZW50PiBwcm90ZWN0b3IodGhpcyk7CisgICAgUmVmUHRy PEJlZm9yZUxvYWRFdmVudD4gYmVmb3JlTG9hZEV2ZW50ID0gQmVmb3JlTG9hZEV2ZW50OjpjcmVh dGUoc291cmNlVVJMKTsKKyAgICBkaXNwYXRjaEV2ZW50KGJlZm9yZUxvYWRFdmVudC5nZXQoKSk7 CisgICAgcmV0dXJuIGluRG9jdW1lbnQoKSAmJiAhYmVmb3JlTG9hZEV2ZW50LT5kZWZhdWx0UHJl dmVudGVkKCk7Cit9CisKIHZvaWQgU1ZHU2NyaXB0RWxlbWVudDo6ZGlzcGF0Y2hMb2FkRXZlbnQo KQogewogICAgIGJvb2wgZXh0ZXJuYWxSZXNvdXJjZXNSZXF1aXJlZCA9IGV4dGVybmFsUmVzb3Vy Y2VzUmVxdWlyZWRCYXNlVmFsdWUoKTsKSW5kZXg6IFdlYkNvcmUvc3ZnL1NWR1NjcmlwdEVsZW1l bnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N2Zy9TVkdTY3JpcHRFbGVtZW50LmgJKHJldmlz aW9uIDQ5MTEyKQorKysgV2ViQ29yZS9zdmcvU1ZHU2NyaXB0RWxlbWVudC5oCSh3b3JraW5nIGNv cHkpCkBAIC02OSw2ICs2OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVh bCBTdHJpbmcgbGFuZ3VhZ2VBdHRyaWJ1dGVWYWx1ZSgpIGNvbnN0OwogICAgICAgICB2aXJ0dWFs IFN0cmluZyBmb3JBdHRyaWJ1dGVWYWx1ZSgpIGNvbnN0OwogCisgICAgICAgIHZpcnR1YWwgYm9v bCBkaXNwYXRjaEJlZm9yZUxvYWRFdmVudChjb25zdCBTdHJpbmcmIHNvdXJjZVVSTCk7CiAgICAg ICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaExvYWRFdmVudCgpOwogICAgICAgICB2aXJ0dWFsIHZv aWQgZGlzcGF0Y2hFcnJvckV2ZW50KCk7CiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ5MTkwKQorKysg TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIw MDktMTAtMDYgIERhdmUgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTMwMTMxLCBtYWtlIGJlZm9yZWxvYWQgZmlyZSBvbiBzY3JpcHQgZWxl bWVudHMuCisKKyAgICAgICAgKiBmYXN0L2RvbS9iZWZvcmVsb2FkOiBBZGRlZC4KKyAgICAgICAg KiBmYXN0L2RvbS9iZWZvcmVsb2FkL3Jlc291cmNlczogQWRkZWQuCisgICAgICAgICogZmFzdC9k b20vYmVmb3JlbG9hZC9zY3JpcHQtYmVmb3JlLWxvYWQtZHluYW1pYy1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGZhc3QvZG9tL2JlZm9yZWxvYWQvc2NyaXB0LWJlZm9yZS1sb2FkLWR5 bmFtaWMuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9kb20vYmVmb3JlbG9hZC9zY3JpcHQt YmVmb3JlLWxvYWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2RvbS9iZWZv cmVsb2FkL3NjcmlwdC1iZWZvcmUtbG9hZC14aHRtbC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIGZhc3QvZG9tL2JlZm9yZWxvYWQvc2NyaXB0LWJlZm9yZS1sb2FkLXhodG1sLnhodG1s OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2RvbS9iZWZvcmVsb2FkL3NjcmlwdC1iZWZvcmUtbG9h ZC5odG1sOiBBZGRlZC4KKwogMjAwOS0xMC0wNiAgSmFrdWIgV2llY3pvcmVrICA8ZmF3MjE3QGdt YWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KSW5kZXg6IExh eW91dFRlc3RzL2Zhc3QvZG9tL2JlZm9yZWxvYWQvc2NyaXB0LWJlZm9yZS1sb2FkLWR5bmFtaWMt ZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZG9tL2JlZm9yZWxv YWQvc2NyaXB0LWJlZm9yZS1sb2FkLWR5bmFtaWMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQor KysgTGF5b3V0VGVzdHMvZmFzdC9kb20vYmVmb3JlbG9hZC9zY3JpcHQtYmVmb3JlLWxvYWQtZHlu YW1pYy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMyBAQAorVGhpcyBwYWdl IHRlc3RzIHRoZSBiZWZvcmVsb2FkIGV2ZW50IG9uIHNjcmlwdCBlbGVtZW50cy4gWW91IHNob3Vs ZCBzZWUgYSBQQVNTIG1lc3NhZ2UgYmVsb3cgaWYgZXZlcnl0aGluZyB3b3Jrcy4KKworUEFTUwpJ bmRleDogTGF5b3V0VGVzdHMvZmFzdC9kb20vYmVmb3JlbG9hZC9zY3JpcHQtYmVmb3JlLWxvYWQt ZHluYW1pYy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZG9tL2JlZm9yZWxv YWQvc2NyaXB0LWJlZm9yZS1sb2FkLWR5bmFtaWMuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91 dFRlc3RzL2Zhc3QvZG9tL2JlZm9yZWxvYWQvc2NyaXB0LWJlZm9yZS1sb2FkLWR5bmFtaWMuaHRt bAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzOSBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+ CitmdW5jdGlvbiBwcmludChtZXNzYWdlLCBjb2xvcikgCit7CisgICAgdmFyIHBhcmFncmFwaCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHBhcmFncmFwaC5hcHBlbmRDaGls ZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShtZXNzYWdlKSk7CisgICAgcGFyYWdyYXBoLnN0eWxl LmZvbnRGYW1pbHkgPSAibW9ub3NwYWNlIjsKKyAgICBpZiAoY29sb3IpCisgICAgICAgIHBhcmFn cmFwaC5zdHlsZS5jb2xvciA9IGNvbG9yOworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJj b25zb2xlIikuYXBwZW5kQ2hpbGQocGFyYWdyYXBoKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgor Cis8Ym9keT4KKzxwPlRoaXMgcGFnZSB0ZXN0cyB0aGUgYmVmb3JlbG9hZCBldmVudCBvbiBzY3Jp cHQgZWxlbWVudHMuICBZb3Ugc2hvdWxkIHNlZSBhIFBBU1MgbWVzc2FnZSBiZWxvdyBpZiBldmVy eXRoaW5nCit3b3Jrcy48L3A+Cis8aHI+Cis8ZGl2IGlkPSdjb25zb2xlJz48L2Rpdj4KKworPHNj cmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgbGF5b3V0VGVzdENv bnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIAorZnVuY3Rpb24gYmVmb3JlTG9hZEZ1bmMoKQor eworICAgIHByaW50KCJQQVNTIiwgImdyZWVuIik7CisgICAgZXZlbnQucHJldmVudERlZmF1bHQo KTsKK30KKworZG9jdW1lbnQuYm9keS5hZGRFdmVudExpc3RlbmVyKCJiZWZvcmVsb2FkIiwgYmVm b3JlTG9hZEZ1bmMsIHRydWUpOwordmFyIGVsdCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNj cmlwdCIpOworZWx0LnNldEF0dHJpYnV0ZSgic3JjIiwgInJlc291cmNlcy9mYWlsLmpzIik7Citk b2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGVsdCk7Cis8L3NjcmlwdD4KKworPC9ib2R5PgorPC9o dG1sPgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9kb20vYmVmb3JlbG9hZC9zY3JpcHQtYmVmb3Jl LWxvYWQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZG9tL2Jl Zm9yZWxvYWQvc2NyaXB0LWJlZm9yZS1sb2FkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL2Zhc3QvZG9tL2JlZm9yZWxvYWQvc2NyaXB0LWJlZm9yZS1sb2FkLWV4cGVj dGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzIEBACitUaGlzIHBhZ2UgdGVzdHMgdGhl IGJlZm9yZWxvYWQgZXZlbnQgb24gc2NyaXB0IGVsZW1lbnRzLiBZb3Ugc2hvdWxkIHNlZSBhIFBB U1MgbWVzc2FnZSBiZWxvdyBpZiBldmVyeXRoaW5nIHdvcmtzLgorCitQQVNTCkluZGV4OiBMYXlv dXRUZXN0cy9mYXN0L2RvbS9iZWZvcmVsb2FkL3NjcmlwdC1iZWZvcmUtbG9hZC14aHRtbC1leHBl Y3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9kb20vYmVmb3JlbG9hZC9z Y3JpcHQtYmVmb3JlLWxvYWQteGh0bWwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvZmFzdC9kb20vYmVmb3JlbG9hZC9zY3JpcHQtYmVmb3JlLWxvYWQteGh0bWwtZXhw ZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMgQEAKK1RoaXMgcGFnZSB0ZXN0cyB0 aGUgYmVmb3JlbG9hZCBldmVudCBvbiBzY3JpcHQgZWxlbWVudHMuIFlvdSBzaG91bGQgc2VlIGEg UEFTUyBtZXNzYWdlIGJlbG93IGlmIGV2ZXJ5dGhpbmcgd29ya3MuCisKK1BBU1MKSW5kZXg6IExh eW91dFRlc3RzL2Zhc3QvZG9tL2JlZm9yZWxvYWQvc2NyaXB0LWJlZm9yZS1sb2FkLXhodG1sLnho dG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZG9tL2JlZm9yZWxvYWQvc2NyaXB0 LWJlZm9yZS1sb2FkLXhodG1sLnhodG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFz dC9kb20vYmVmb3JlbG9hZC9zY3JpcHQtYmVmb3JlLWxvYWQteGh0bWwueGh0bWwJKHJldmlzaW9u IDApCkBAIC0wLDAgKzEsMzggQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04 Ij8+Cis8aHRtbCB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCI+Cis8aGVhZD4K KzxzY3JpcHQ+CitmdW5jdGlvbiBwcmludChtZXNzYWdlLCBjb2xvcikgCit7CisgICAgdmFyIHBh cmFncmFwaCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHBhcmFncmFwaC5h cHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShtZXNzYWdlKSk7CisgICAgcGFyYWdy YXBoLnN0eWxlLmZvbnRGYW1pbHkgPSAibW9ub3NwYWNlIjsKKyAgICBpZiAoY29sb3IpCisgICAg ICAgIHBhcmFncmFwaC5zdHlsZS5jb2xvciA9IGNvbG9yOworICAgIGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJjb25zb2xlIikuYXBwZW5kQ2hpbGQocGFyYWdyYXBoKTsKK30KKzwvc2NyaXB0Pgor PC9oZWFkPgorCis8Ym9keT4KKzxwPlRoaXMgcGFnZSB0ZXN0cyB0aGUgYmVmb3JlbG9hZCBldmVu dCBvbiBzY3JpcHQgZWxlbWVudHMuICBZb3Ugc2hvdWxkIHNlZSBhIFBBU1MgbWVzc2FnZSBiZWxv dyBpZiBldmVyeXRoaW5nCit3b3Jrcy48L3A+Cis8aHIvPgorPGRpdiBpZD0iY29uc29sZSI+PC9k aXY+CisKKzxzY3JpcHQ+CitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgIGxh eW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICAKK2Z1bmN0aW9uIGJlZm9yZUxv YWRGdW5jKCkKK3sKKyAgICBwcmludCgiUEFTUyIsICJncmVlbiIpOworICAgIGV2ZW50LnByZXZl bnREZWZhdWx0KCk7Cit9CisKK2RvY3VtZW50LmJvZHkuYWRkRXZlbnRMaXN0ZW5lcigiYmVmb3Jl bG9hZCIsIGJlZm9yZUxvYWRGdW5jLCB0cnVlKTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9InJl c291cmNlcy9mYWlsLmpzIj48L3NjcmlwdD4KKworPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5 b3V0VGVzdHMvZmFzdC9kb20vYmVmb3JlbG9hZC9zY3JpcHQtYmVmb3JlLWxvYWQuaHRtbAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2RvbS9iZWZvcmVsb2FkL3NjcmlwdC1iZWZvcmUt bG9hZC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9kb20vYmVmb3JlbG9h ZC9zY3JpcHQtYmVmb3JlLWxvYWQuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyNyBAQAor PGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+CitmdW5jdGlvbiBwcmludChtZXNzYWdlLCBjb2xvcikg Cit7CisgICAgdmFyIHBhcmFncmFwaCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwor ICAgIHBhcmFncmFwaC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShtZXNzYWdl KSk7CisgICAgcGFyYWdyYXBoLnN0eWxlLmZvbnRGYW1pbHkgPSAibW9ub3NwYWNlIjsKKyAgICBp ZiAoY29sb3IpCisgICAgICAgIHBhcmFncmFwaC5zdHlsZS5jb2xvciA9IGNvbG9yOworICAgIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25zb2xlIikuYXBwZW5kQ2hpbGQocGFyYWdyYXBoKTsK K30KKzwvc2NyaXB0PgorPC9oZWFkPgorCis8Ym9keT4KKzxwPlRoaXMgcGFnZSB0ZXN0cyB0aGUg YmVmb3JlbG9hZCBldmVudCBvbiBzY3JpcHQgZWxlbWVudHMuICBZb3Ugc2hvdWxkIHNlZSBhIFBB U1MgbWVzc2FnZSBiZWxvdyBpZiBldmVyeXRoaW5nCit3b3Jrcy48L3A+Cis8aHI+Cis8ZGl2IGlk PSdjb25zb2xlJz48L2Rpdj4KKzxzY3JpcHQ+CitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9s bGVyKQorICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKzwvc2NyaXB0Pgor PHNjcmlwdCBvbmJlZm9yZWxvYWQ9InByaW50KCdQQVNTJywgJ2dyZWVuJyk7IHJldHVybiBmYWxz ZSIgc3JjPSJyZXNvdXJjZXMvZmFpbC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==