130553 2014-03-20 18:40:22 -0700 Change CodeGeneratorJS.pm special cases for "DOMWindow" to be general purpose 2014-03-28 11:14:08 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 130554 1 msaboff msaboff cdumez cgarcia commit-queue esprehn+autocc kondapallykalyan oldest_to_newest 992853 0 msaboff 2014-03-20 18:40:22 -0700 There are many places in CodeGeneratorJS.pm where there is if ($interfaceName eq "DOMWindow") that will emit code to return the JSDOMWindowShell* associated with the JSDOMWindow. This should be changed to be more general purpose so it can be used by JSWorkerGlobalScope based objects that have a similar need. 992880 1 227374 msaboff 2014-03-20 21:02:33 -0700 Created attachment 227374 Patch 992913 2 227374 mark.lam 2014-03-20 22:36:54 -0700 Comment on attachment 227374 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227374&action=review > Source/WebCore/bindings/scripts/CodeGeneratorJS.pm:2379 > push(@implContent, " if (UNLIKELY(!castedThis)) {\n"); > push(@implContent, " if (JSDOMWindowShell* shell = jsDynamicCast<JSDOMWindowShell*>(JSValue::decode(thisValue)))\n"); > push(@implContent, " castedThis = shell->window();\n"); > push(@implContent, " }\n"); Is this section still needed? In the other 3 sites where you did this change, you removed this null check and the computing of the result from shell->window(). 992919 3 msaboff 2014-03-20 22:59:40 -0700 (In reply to comment #2) > (From update of attachment 227374 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=227374&action=review > > > Source/WebCore/bindings/scripts/CodeGeneratorJS.pm:2379 > > push(@implContent, " if (UNLIKELY(!castedThis)) {\n"); > > push(@implContent, " if (JSDOMWindowShell* shell = jsDynamicCast<JSDOMWindowShell*>(JSValue::decode(thisValue)))\n"); > > push(@implContent, " castedThis = shell->window();\n"); > > push(@implContent, " }\n"); > > Is this section still needed? In the other 3 sites where you did this change, you removed this null check and the computing of the result from shell->window(). You are right, this section is redundant with what's in toJSDOMWimdow(). I'll remove it. 992926 4 227374 ggaren 2014-03-20 23:20:19 -0700 Comment on attachment 227374 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227374&action=review r=me > Source/WebCore/bindings/scripts/IDLAttributes.txt:46 > +CustomProxyToJSObject Seems like we should just call this "CustomToJSObject". Even though only proxies happen to use this feature, the feature doesn't need to be tightly coupled to proxies. 993075 5 msaboff 2014-03-21 07:12:51 -0700 (In reply to comment #4) > (From update of attachment 227374 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=227374&action=review > > r=me > > > Source/WebCore/bindings/scripts/IDLAttributes.txt:46 > > +CustomProxyToJSObject > > Seems like we should just call this "CustomToJSObject". Even though only proxies happen to use this feature, the feature doesn't need to be tightly coupled to proxies. CustomToJSObject is already taken and used in a wider variety of places. Also there are two instances where the custom to*() returns a RefPtr. Therefore I chose a different name. I'm open to suggestions. 993177 6 msaboff 2014-03-21 10:16:38 -0700 (In reply to comment #5) > (In reply to comment #4) > > (From update of attachment 227374 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=227374&action=review > > > > r=me > > > > > Source/WebCore/bindings/scripts/IDLAttributes.txt:46 > > > +CustomProxyToJSObject > > > > Seems like we should just call this "CustomToJSObject". Even though only proxies happen to use this feature, the feature doesn't need to be tightly coupled to proxies. > > CustomToJSObject is already taken and used in a wider variety of places. Also there are two instances where the custom to*() returns a RefPtr. Therefore I chose a different name. I'm open to suggestions. I looked into this again. CustomToJSObject is used for a custom "toJS()". It is JSCustomToNativeObject that is used for a custom "to<className>()", which I also tried. 993185 7 msaboff 2014-03-21 10:29:36 -0700 Committed r166070: <http://trac.webkit.org/changeset/166070> 994308 8 msaboff 2014-03-25 13:28:01 -0700 <rdar://problem/15940627> 994619 9 msaboff 2014-03-26 10:30:19 -0700 Reopened as changed was rolled out in <http://trac.webkit.org/changeset/166249> due to page load time performance regression. 995399 10 msaboff 2014-03-28 11:14:08 -0700 Relanded in change set r166040 - <http://trac.webkit.org/changeset/166404> 227374 2014-03-20 21:02:33 -0700 2014-03-20 23:20:19 -0700 Patch 130553.patch text/plain 8908 msaboff SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjAzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE0LTAzLTIwICBNaWNoYWVs IFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIENoYW5nZSBDb2RlR2VuZXJh dG9ySlMucG0gc3BlY2lhbCBjYXNlcyBmb3IgIkRPTVdpbmRvdyIgdG8gYmUgZ2VuZXJhbCBwdXJw b3NlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA1 NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbGlt aW5hdGVkICdpZiAoJGludGVyZmFjZU5hbWUgZXEgIkRPTVdpbmRvdyIpIHsnIHNlY3Rpb25zIGlu IENvZGVHZW5lcmF0b3JKUyB3aGVyZQorICAgICAgICBpdCB3YXMgdXNlZCB0byBkbyBET01XaW5k b3cgc3BlY2lmaWMgY2FzdGluZyB0byBhIEpTT2JqZWN0LCBlaXRoZXIgYSBKU0RPTVdpbmRvdyog b3IKKyAgICAgICAgYSBKU0RPTVdpbmRvd1NoZWxsKi4gIEluc3RlYWQgdGhlIGNvZGUgZ2VuZXJh dG9yIHdpbGwgdXNlIHRoZSBleGlzdGluZyAKKyAgICAgICAgSlNET01XaW5kb3cqIHRvSlNET01X aW5kb3coSlNWYWx1ZSB2YWx1ZSkgZnVuY3Rpb24gYmFzZWQgb24gYSBuZXdseSBhZGRlZCBhdHRy aWJ1dGUKKyAgICAgICAgIkN1c3RvbVByb3h5VG9KU09iamVjdCIuICBUaGF0IGF0dHJpYnV0ZSB3 aWxsIGVtaXQgYSBjYWxsIHRvIHRoZSBmdW5jdGlvbgorICAgICAgICAke2NsYXNzTmFtZX0qIHRv JHtjbGFzc05hbWV9KEpTVmFsdWUpLgorCisgICAgICAgIFRoaXMgaXMgYmVpbmcgZG9uZSB0byBj bGVhbiB1cCB0aGUgY29kZSBnZW5lcmF0b3IgYW5kIGZvciBhIHN1YnNlcXVlbnQgcGF0Y2ggdGhh dAorICAgICAgICB3aWxsIHVzZSBhIHNpbWlsYXIgY3VzdG9tIHRve2NsYXNzTmFtZX0gZnVuY3Rp b24gZm9yIHdvcmtlcnMsCisgICAgICAgIEpTRGVkaWNhdGVkV29ya2VyR2xvYmFsU2NvcGUqIHRv SlNEZWRpY2F0ZWRXb3JrZXJHbG9iYWxTY29wZShKU1ZhbHVlKS4KKworICAgICAgICBDaGFuZ2Vz IGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRz L0NvZGVHZW5lcmF0b3JKUy5wbToKKyAgICAgICAgKEdlbmVyYXRlSW1wbGVtZW50YXRpb24pOgor ICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvSURMQXR0cmlidXRlcy50eHQ6CisgICAgICAgICog cGFnZS9ET01XaW5kb3cuaWRsOgorCiAyMDE0LTAzLTIwICBUaGlhZ28gZGUgQmFycm9zIExhY2Vy ZGEgIDx0aGlhZ28ubGFjZXJkYUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFtFRkxdW0dUS10g R2V0IENNYWtlIHRvIGZpbmQgRnJlZXR5cGUyIHByb3Blcmx5CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQkocmV2aXNpb24g MTY2MDM3KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y SlMucG0JKHdvcmtpbmcgY29weSkKQEAgLTIxMjcsMTIgKzIxMjcsOCBAQCBzdWIgR2VuZXJhdGVJ bXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICJ7XG4iKTsKIAog ICAgICAgICAgICAgaWYgKCEkYXR0cmlidXRlLT5pc1N0YXRpYyB8fCAkYXR0cmlidXRlLT5zaWdu YXR1cmUtPnR5cGUgPX4gL0NvbnN0cnVjdG9yJC8pIHsKLSAgICAgICAgICAgICAgICBpZiAoJGlu dGVyZmFjZU5hbWUgZXEgIkRPTVdpbmRvdyIpIHsKLSAgICAgICAgICAgICAgICAgICAgcHVzaChA aW1wbENvbnRlbnQsICIgICAgJHtjbGFzc05hbWV9KiBjYXN0ZWRUaGlzID0ganNEeW5hbWljQ2Fz dDwkY2xhc3NOYW1lKj4oSlNWYWx1ZTo6ZGVjb2RlKHRoaXNWYWx1ZSkpO1xuIik7Ci0gICAgICAg ICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGlmIChVTkxJS0VMWSghY2FzdGVk VGhpcykpIHtcbiIpOwotICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAg ICAgICAgaWYgKEpTRE9NV2luZG93U2hlbGwqIHNoZWxsID0ganNEeW5hbWljQ2FzdDxKU0RPTVdp bmRvd1NoZWxsKj4oSlNWYWx1ZTo6ZGVjb2RlKHRoaXNWYWx1ZSkpKVxuIik7Ci0gICAgICAgICAg ICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICAgICAgY2FzdGVkVGhpcyA9IHNo ZWxsLT53aW5kb3coKTtcbiIpOwotICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVu dCwgIiAgICB9XG4iKTsKKyAgICAgICAgICAgICAgICBpZiAoJGludGVyZmFjZS0+ZXh0ZW5kZWRB dHRyaWJ1dGVzLT57IkN1c3RvbVByb3h5VG9KU09iamVjdCJ9KSB7CisgICAgICAgICAgICAgICAg ICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICR7Y2xhc3NOYW1lfSogY2FzdGVkVGhpcyA9IHRv JHtjbGFzc05hbWV9KEpTVmFsdWU6OmRlY29kZSh0aGlzVmFsdWUpKTtcbiIpOwogICAgICAgICAg ICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBVTlVTRURfUEFSQU0oc2xvdEJhc2Up O1xuIik7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgcHVz aChAaW1wbENvbnRlbnQsICIgICAgJHtjbGFzc05hbWV9KiBjYXN0ZWRUaGlzID0ganNEeW5hbWlj Q2FzdDwkY2xhc3NOYW1lKj4oSlNWYWx1ZTo6ZGVjb2RlKHRoaXNWYWx1ZSkpO1xuIik7CkBAIC0y MzUwLDEyICsyMzQ2LDggQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICAg IHB1c2goQGltcGxDb250ZW50LCAie1xuIik7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVu dCwgIiAgICBVTlVTRURfUEFSQU0oYmFzZVZhbHVlKTtcbiIpOwogICAgICAgICAgICAgcHVzaChA aW1wbENvbnRlbnQsICIgICAgVU5VU0VEX1BBUkFNKHRoaXNWYWx1ZSk7XG4iKTsKLSAgICAgICAg ICAgIGlmICgkaW50ZXJmYWNlTmFtZSBlcSAiRE9NV2luZG93IikgewotICAgICAgICAgICAgICAg IHB1c2goQGltcGxDb250ZW50LCAiICAgICR7Y2xhc3NOYW1lfSogZG9tT2JqZWN0ID0ganNEeW5h bWljQ2FzdDwkY2xhc3NOYW1lKj4oSlNWYWx1ZTo6ZGVjb2RlKHRoaXNWYWx1ZSkpO1xuIik7Ci0g ICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKCFkb21PYmplY3QpIHtc biIpOwotICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICBpZiAoSlNE T01XaW5kb3dTaGVsbCogc2hlbGwgPSBqc0R5bmFtaWNDYXN0PEpTRE9NV2luZG93U2hlbGwqPihK U1ZhbHVlOjpkZWNvZGUodGhpc1ZhbHVlKSkpXG4iKTsKLSAgICAgICAgICAgICAgICBwdXNoKEBp bXBsQ29udGVudCwgIiAgICAgICAgICAgIGRvbU9iamVjdCA9IHNoZWxsLT53aW5kb3coKTtcbiIp OwotICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIH1cbiIpOworICAgICAg ICAgICAgaWYgKCRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b21Qcm94eVRv SlNPYmplY3QifSkgeworICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICR7 Y2xhc3NOYW1lfSogZG9tT2JqZWN0ID0gdG8ke2NsYXNzTmFtZX0oSlNWYWx1ZTo6ZGVjb2RlKHRo aXNWYWx1ZSkpO1xuIik7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIHB1 c2goQGltcGxDb250ZW50LCAiICAgICR7Y2xhc3NOYW1lfSogZG9tT2JqZWN0ID0ganNEeW5hbWlj Q2FzdDwke2NsYXNzTmFtZX0qPihKU1ZhbHVlOjpkZWNvZGUodGhpc1ZhbHVlKSk7XG4iKSBpZiBD b25zdHJ1Y3RvclNob3VsZEJlT25JbnN0YW5jZSgkaW50ZXJmYWNlKTsKICAgICAgICAgICAgICAg ICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAke2NsYXNzTmFtZX1Qcm90b3R5cGUqIGRvbU9iamVj dCA9IGpzRHluYW1pY0Nhc3Q8JHtjbGFzc05hbWV9UHJvdG90eXBlKj4oYmFzZVZhbHVlKTtcbiIp IGlmICFDb25zdHJ1Y3RvclNob3VsZEJlT25JbnN0YW5jZSgkaW50ZXJmYWNlKTsKQEAgLTIzNzks MTIgKzIzNzEsMTQgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICAgIHB1 c2goQGltcGxDb250ZW50LCAidm9pZCAke2NvbnN0cnVjdG9yRnVuY3Rpb25OYW1lfShFeGVjU3Rh dGUqIGV4ZWMsIEpTT2JqZWN0KiwgRW5jb2RlZEpTVmFsdWUgdGhpc1ZhbHVlLCBFbmNvZGVkSlNW YWx1ZSBlbmNvZGVkVmFsdWUpXG4iKTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAi e1xuIik7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBKU1ZhbHVlIHZhbHVl ID0gSlNWYWx1ZTo6ZGVjb2RlKGVuY29kZWRWYWx1ZSk7Iik7Ci0gICAgICAgICAgICBwdXNoKEBp bXBsQ29udGVudCwgIiAgICAke2NsYXNzTmFtZX0qIGNhc3RlZFRoaXMgPSBqc0R5bmFtaWNDYXN0 PCR7Y2xhc3NOYW1lfSo+KEpTVmFsdWU6OmRlY29kZSh0aGlzVmFsdWUpKTtcbiIpOwotICAgICAg ICAgICAgaWYgKCRpbnRlcmZhY2VOYW1lIGVxICJET01XaW5kb3ciKSB7CisgICAgICAgICAgICBp ZiAoJGludGVyZmFjZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkN1c3RvbVByb3h5VG9KU09iamVj dCJ9KSB7CisgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJHtjbGFzc05h bWV9KiBjYXN0ZWRUaGlzID0gdG8ke2NsYXNzTmFtZX0oSlNWYWx1ZTo6ZGVjb2RlKHRoaXNWYWx1 ZSkpO1xuIik7CiAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKFVO TElLRUxZKCFjYXN0ZWRUaGlzKSkge1xuIik7CiAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENv bnRlbnQsICIgICAgICAgIGlmIChKU0RPTVdpbmRvd1NoZWxsKiBzaGVsbCA9IGpzRHluYW1pY0Nh c3Q8SlNET01XaW5kb3dTaGVsbCo+KEpTVmFsdWU6OmRlY29kZSh0aGlzVmFsdWUpKSlcbiIpOwog ICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICAgICAgY2FzdGVkVGhp cyA9IHNoZWxsLT53aW5kb3coKTtcbiIpOwogICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250 ZW50LCAiICAgIH1cbiIpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBw dXNoKEBpbXBsQ29udGVudCwgIiAgICAke2NsYXNzTmFtZX0qIGNhc3RlZFRoaXMgPSBqc0R5bmFt aWNDYXN0PCR7Y2xhc3NOYW1lfSo+KEpTVmFsdWU6OmRlY29kZSh0aGlzVmFsdWUpKTtcbiIpOwog ICAgICAgICAgICAgfQogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKFVO TElLRUxZKCFjYXN0ZWRUaGlzKSkge1xuIik7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVu dCwgIiAgICAgICAgdGhyb3dWTVR5cGVFcnJvcihleGVjKTtcbiIpOwpAQCAtMjQ4OCwxMiArMjQ4 MiwxMCBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgICAgIHB1c2go QGltcGxDb250ZW50LCAiICAgIEpTVmFsdWUgdmFsdWUgPSBKU1ZhbHVlOjpkZWNvZGUoZW5jb2Rl ZFZhbHVlKTtcbiIpOwogICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIFVO VVNFRF9QQVJBTShleGVjKTtcbiIpOwogICAgICAgICAgICAgICAgIGlmICghJGF0dHJpYnV0ZS0+ aXNTdGF0aWMpIHsKLSAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAg JHtjbGFzc05hbWV9KiBjYXN0ZWRUaGlzID0ganNEeW5hbWljQ2FzdDwke2NsYXNzTmFtZX0qPihK U1ZhbHVlOjpkZWNvZGUodGhpc1ZhbHVlKSk7XG4iKTsKLSAgICAgICAgICAgICAgICAgICAgaWYg KCRpbnRlcmZhY2VOYW1lIGVxICJET01XaW5kb3ciKSB7Ci0gICAgICAgICAgICAgICAgICAgICAg ICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBpZiAoVU5MSUtFTFkoIWNhc3RlZFRoaXMpKSB7XG4i KTsKLSAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICBp ZiAoSlNET01XaW5kb3dTaGVsbCogc2hlbGwgPSBqc0R5bmFtaWNDYXN0PEpTRE9NV2luZG93U2hl bGwqPihKU1ZhbHVlOjpkZWNvZGUodGhpc1ZhbHVlKSkpXG4iKTsKLSAgICAgICAgICAgICAgICAg ICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICAgICAgY2FzdGVkVGhpcyA9IHNoZWxs LT53aW5kb3coKTtcbiIpOwotICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRl bnQsICIgICAgfVxuIik7CisgICAgICAgICAgICAgICAgICAgIGlmICgkaW50ZXJmYWNlLT5leHRl bmRlZEF0dHJpYnV0ZXMtPnsiQ3VzdG9tUHJveHlUb0pTT2JqZWN0In0pIHsKKyAgICAgICAgICAg ICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICR7Y2xhc3NOYW1lfSogY2FzdGVk VGhpcyA9IHRvJHtjbGFzc05hbWV9KEpTVmFsdWU6OmRlY29kZSh0aGlzVmFsdWUpKTtcbiIpOwor ICAgICAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAgICAgICAgcHVz aChAaW1wbENvbnRlbnQsICIgICAgJHtjbGFzc05hbWV9KiBjYXN0ZWRUaGlzID0ganNEeW5hbWlj Q2FzdDwke2NsYXNzTmFtZX0qPihKU1ZhbHVlOjpkZWNvZGUodGhpc1ZhbHVlKSk7XG4iKTsKICAg ICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVu dCwgIiAgICBpZiAoVU5MSUtFTFkoIWNhc3RlZFRoaXMpKSB7XG4iKTsKICAgICAgICAgICAgICAg ICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgICAgIHRocm93Vk1UeXBlRXJyb3IoZXhlYywg bWFrZURPTUJpbmRpbmdzVHlwZUVycm9yU3RyaW5nKFwiVGhlIFwiLCBcIiRpbnRlcmZhY2VOYW1l XCIsIFwiLlwiLCBcIiRuYW1lXCIsIFwiIHNldHRlciBjYW4gb25seSBiZSB1c2VkIG9uIGluc3Rh bmNlcyBvZiBcIiwgXCIkaW50ZXJmYWNlTmFtZVwiKSk7XG4iKTsKQEAgLTI3MTgsOCArMjcxMCw4 IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAgICAgICAgICAgICAgICAgICAgIEdlbmVy YXRlSW1wbGVtZW50YXRpb25GdW5jdGlvbkNhbGwoJGZ1bmN0aW9uLCAkZnVuY3Rpb25TdHJpbmcs ICIgICAgIiwgJHN2Z1Byb3BlcnR5VHlwZSwgJGludGVyZmFjZU5hbWUpOwogICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgaWYgKCRpbnRlcmZh Y2VOYW1lIGVxICJET01XaW5kb3ciKSB7Ci0gICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxD b250ZW50LCAiICAgICRjbGFzc05hbWUqIGNhc3RlZFRoaXMgPSB0b0pTRE9NV2luZG93KGV4ZWMt Pmhvc3RUaGlzVmFsdWUoKS50b1RoaXMoZXhlYywgTm90U3RyaWN0TW9kZSkpO1xuIik7CisgICAg ICAgICAgICAgICAgaWYgKCRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b21Q cm94eVRvSlNPYmplY3QifSkgeworICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVu dCwgIiAgICAkY2xhc3NOYW1lKiBjYXN0ZWRUaGlzID0gdG8ke2NsYXNzTmFtZX0oZXhlYy0+aG9z dFRoaXNWYWx1ZSgpLnRvVGhpcyhleGVjLCBOb3RTdHJpY3RNb2RlKSk7XG4iKTsKICAgICAgICAg ICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKFVOTElLRUxZKCFjYXN0ZWRU aGlzKSlcbiIpOwogICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAg ICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3IoZXhlYyk7XG4iKTsKICAgICAgICAgICAgICAgICB9 IGVsc2lmICgkaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiV29ya2VyR2xvYmFsU2Nv cGUifSkgewpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExBdHRyaWJ1 dGVzLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lE TEF0dHJpYnV0ZXMudHh0CShyZXZpc2lvbiAxNjYwMzcpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0lETEF0dHJpYnV0ZXMudHh0CSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0 Myw3IEBAIEN1c3RvbUluZGV4ZWRTZXR0ZXIKIEN1c3RvbUlzUmVhY2hhYmxlCiBDdXN0b21OYW1l ZEdldHRlcgogQ3VzdG9tTmFtZWRTZXR0ZXIKK0N1c3RvbVByb3h5VG9KU09iamVjdAogQ3VzdG9t UHV0RnVuY3Rpb24KIEN1c3RvbVJldHVybgogQ3VzdG9tU2V0dGVyCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wYWdlL0RPTVdpbmRvdy5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFn ZS9ET01XaW5kb3cuaWRsCShyZXZpc2lvbiAxNjYwMzcpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdl L0RPTVdpbmRvdy5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKICAgICBDdXN0 b21EZWxldGVQcm9wZXJ0eSwKICAgICBDdXN0b21HZXRPd25Qcm9wZXJ0eVNsb3QsCiAgICAgQ3Vz dG9tRW51bWVyYXRlUHJvcGVydHksCisgICAgQ3VzdG9tUHJveHlUb0pTT2JqZWN0LAogICAgIEpT Q3VzdG9tTWFya0Z1bmN0aW9uLAogICAgIEpTQ3VzdG9tVG9OYXRpdmVPYmplY3QsCiAgICAgQ3Vz dG9tUHV0RnVuY3Rpb24sCg==