32020 2009-12-01 07:32:25 -0800 [Chromium] Provide a way to get ScriptState for the inspected page 2009-12-01 08:24:02 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys pfeldman webkit.review.bot oldest_to_newest 167598 0 yurys 2009-12-01 07:32:25 -0800 InspectorController::didEvaluateForTestInFrontend needs to invoke a function in the inspected page main frame. Would be nice to be able to get ScriptState for the frame. 167599 1 44075 yurys 2009-12-01 07:34:58 -0800 Created attachment 44075 patch 167600 2 webkit.review.bot 2009-12-01 07:36:45 -0800 Attachment 44075 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/bindings/v8/ScriptController.cpp:360: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/bindings/v8/ScriptController.cpp:362: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/bindings/v8/ScriptController.h:51: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 3 167601 3 44076 yurys 2009-12-01 07:36:55 -0800 Created attachment 44076 patch 167602 4 webkit.review.bot 2009-12-01 07:42:07 -0800 Attachment 44076 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/bindings/v8/ScriptController.h:51: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 167608 5 44076 abarth 2009-12-01 07:49:58 -0800 Comment on attachment 44076 patch Maybe we should call this mainWorldScriptState to be explicit? 167621 6 44080 yurys 2009-12-01 08:08:18 -0800 Created attachment 44080 patch addressing comments that I'm going to land 167622 7 yurys 2009-12-01 08:08:48 -0800 (In reply to comment #5) > (From update of attachment 44076 [details]) > Maybe we should call this mainWorldScriptState to be explicit? Done. 167630 8 yurys 2009-12-01 08:24:02 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/bindings/v8/ScriptController.cpp M WebCore/bindings/v8/ScriptController.h M WebCore/bindings/v8/ScriptState.cpp Committed r51538 44075 2009-12-01 07:34:58 -0800 2009-12-01 07:36:55 -0800 patch script-state.patch text/plain 3226 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGEwMTI1YS4uZDFkYThhNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMi0wMSAgWXVyeSBTZW1pa2hh dHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBQcm92aWRlIGEgd2F5IHRvIGdldCBTY3JpcHRTdGF0ZSBmb3Ig dGhlIGluc3BlY3RlZCBwYWdlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zMjAyMAorCisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0Q29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpzY3JpcHRTdGF0 ZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oOgorICAgICAgICAq IGJpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNjcmlwdFN0 YXRlRnJvbVBhZ2UpOgorCiAyMDA5LTEyLTAxICBDaHJpcyBNYXJyaW4gIDxjbWFycmluQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KZGlmZiAtLWdpdCBhL1dl YkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2JpbmRpbmdz L3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IGRkMjdkYzkuLmRjMzg2NzUgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29y ZS9iaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcApAQCAtNDcsNiArNDcsNyBAQAogI2lu Y2x1ZGUgIm5wcnVudGltZV9wcml2LmgiCiAjaW5jbHVkZSAiTlBWOE9iamVjdC5oIgogI2luY2x1 ZGUgIlNjcmlwdFNvdXJjZUNvZGUuaCIKKyNpbmNsdWRlICJTY3JpcHRTdGF0ZS5oIgogI2luY2x1 ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiVjhCaW5kaW5nLmgiCiAjaW5jbHVkZSAiVjhOUE9i amVjdC5oIgpAQCAtMzU0LDYgKzM1NSwxMyBAQCB2b2lkIFNjcmlwdENvbnRyb2xsZXI6OmdldEFs bFdvcmxkcyhWZWN0b3I8RE9NV3JhcHBlcldvcmxkKj4mIHdvcmxkcykKICAgICB3b3JsZHMuYXBw ZW5kKG1haW5UaHJlYWROb3JtYWxXb3JsZCgpKTsKIH0KIAorU2NyaXB0U3RhdGUqIFNjcmlwdENv bnRyb2xsZXI6OnNjcmlwdFN0YXRlKCkKK3sKKyAgaWYgKCFtX3NjcmlwdFN0YXRlKQorICAgICAg bV9zY3JpcHRTdGF0ZS5zZXQobmV3IFNjcmlwdFN0YXRlKG1fZnJhbWUsIFY4UHJveHk6Om1haW5X b3JsZENvbnRleHQobV9mcmFtZSkpKTsKKyAgcmV0dXJuIG1fc2NyaXB0U3RhdGUuZ2V0KCk7Cit9 CisKIHN0YXRpYyBOUE9iamVjdCogY3JlYXRlTm9TY3JpcHRPYmplY3QoKQogewogICAgIG5vdElt cGxlbWVudGVkKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRy b2xsZXIuaCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oCmluZGV4IGFh MGU0NjcuLmM2MDQyMDUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29u dHJvbGxlci5oCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oCkBA IC00OCw2ICs0OCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBGcmFtZTsKICAg ICBjbGFzcyBIVE1MUGx1Z0luRWxlbWVudDsKICAgICBjbGFzcyBTY3JpcHRTb3VyY2VDb2RlOwor ICAgIGNsYXNzIFNjcmlwdFN0YXRlOwogICAgIGNsYXNzIFN0cmluZzsKICAgICBjbGFzcyBXaWRn ZXQ7CiAgICAgY2xhc3MgWFNTQXVkaXRvcjsKQEAgLTE3MCw2ICsxNzEsOSBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIHZvaWQgZXZhbHVhdGVJbldvcmxkKGNvbnN0IFNjcmlwdFNvdXJj ZUNvZGUmLCBET01XcmFwcGVyV29ybGQqKSB7IH0KICAgICAgICAgc3RhdGljIHZvaWQgZ2V0QWxs V29ybGRzKFZlY3RvcjxET01XcmFwcGVyV29ybGQqPiYgd29ybGRzKTsKIAorICAgICAgICAvLyBT Y3JpcHQgc3RhdGUgZm9yIHRoZSBtYWluIHdvcmxkIGNvbnRleHQuCisgICAgICAgIFNjcmlwdFN0 YXRlKiBzY3JpcHRTdGF0ZSgpOworCiAgICAgcHJpdmF0ZToKICAgICAgICAgRnJhbWUqIG1fZnJh bWU7CiAgICAgICAgIGNvbnN0IFN0cmluZyogbV9zb3VyY2VVUkw7CkBAIC0xOTIsNiArMTk2LDkg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogI2VuZGlmCiAgICAgICAgIC8vIFRoZSBYU1NBdWRpdG9y IGFzc29jaWF0ZWQgd2l0aCB0aGlzIFNjcmlwdENvbnRyb2xsZXIuCiAgICAgICAgIE93blB0cjxY U1NBdWRpdG9yPiBtX1hTU0F1ZGl0b3I7CisKKyAgICAgICAgLy8gU2NyaXB0IHN0YXRlIGZvciB0 aGUgbWFpbiB3b3JsZCBjb250ZXh0LgorICAgICAgICBPd25QdHI8U2NyaXB0U3RhdGU+IG1fc2Ny aXB0U3RhdGU7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTdGF0ZS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdFN0YXRlLmNwcAppbmRleCAwYjVjZDA4Li4xMDMwMThjIDEwMDY0NAotLS0gYS9XZWJD b3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdFN0YXRlLmNwcApAQCAtNjgsOSArNjgsOCBAQCBTY3JpcHRTdGF0ZSogc2NyaXB0U3Rh dGVGcm9tTm9kZShET01XcmFwcGVyV29ybGQqLCBOb2RlKiBub2RlKQogCiBTY3JpcHRTdGF0ZSog c2NyaXB0U3RhdGVGcm9tUGFnZShET01XcmFwcGVyV29ybGQqLCBQYWdlKiBwYWdlKQogewotICAg IC8vIFRoaXMgc2hvdWxkIGJlIG5ldmVyIHJlYWNoZWQgd2l0aCBWOCBiaW5kaW5ncy4KLSAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gMDsKKyAgICAvLyBUaGlzIHNob3VsZCBi ZSBvbmx5IHJlYWNoZWQgd2l0aCBWOCBiaW5kaW5ncyBmcm9tIHNpbmdsZSBwcm9jZXNzIGxheW91 dCB0ZXN0cy4KKyAgICByZXR1cm4gcGFnZS0+bWFpbkZyYW1lKCktPnNjcmlwdCgpLT5zY3JpcHRT dGF0ZSgpOwogfQogCiAvLyBGSVhNRTogU3R1YiBtZXRob2Qgc28gd2UgY29tcGlsZS4gIEN1cnJl bnRseSBjYWxsZWQgZnJvbSBGcmFtZUxvYWRlci5jcHAuCg== 44076 2009-12-01 07:36:55 -0800 2009-12-01 08:08:18 -0800 patch script-state2.patch text/plain 3232 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGEwMTI1YS4uZDFkYThhNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMi0wMSAgWXVyeSBTZW1pa2hh dHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBQcm92aWRlIGEgd2F5IHRvIGdldCBTY3JpcHRTdGF0ZSBmb3Ig dGhlIGluc3BlY3RlZCBwYWdlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zMjAyMAorCisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0Q29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpzY3JpcHRTdGF0 ZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oOgorICAgICAgICAq IGJpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNjcmlwdFN0 YXRlRnJvbVBhZ2UpOgorCiAyMDA5LTEyLTAxICBDaHJpcyBNYXJyaW4gIDxjbWFycmluQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KZGlmZiAtLWdpdCBhL1dl YkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2JpbmRpbmdz L3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IGRkMjdkYzkuLjNlZmRmNjAgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29y ZS9iaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcApAQCAtNDcsNiArNDcsNyBAQAogI2lu Y2x1ZGUgIm5wcnVudGltZV9wcml2LmgiCiAjaW5jbHVkZSAiTlBWOE9iamVjdC5oIgogI2luY2x1 ZGUgIlNjcmlwdFNvdXJjZUNvZGUuaCIKKyNpbmNsdWRlICJTY3JpcHRTdGF0ZS5oIgogI2luY2x1 ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiVjhCaW5kaW5nLmgiCiAjaW5jbHVkZSAiVjhOUE9i amVjdC5oIgpAQCAtMzU0LDYgKzM1NSwxMyBAQCB2b2lkIFNjcmlwdENvbnRyb2xsZXI6OmdldEFs bFdvcmxkcyhWZWN0b3I8RE9NV3JhcHBlcldvcmxkKj4mIHdvcmxkcykKICAgICB3b3JsZHMuYXBw ZW5kKG1haW5UaHJlYWROb3JtYWxXb3JsZCgpKTsKIH0KIAorU2NyaXB0U3RhdGUqIFNjcmlwdENv bnRyb2xsZXI6OnNjcmlwdFN0YXRlKCkKK3sKKyAgICBpZiAoIW1fc2NyaXB0U3RhdGUpCisgICAg ICAgIG1fc2NyaXB0U3RhdGUuc2V0KG5ldyBTY3JpcHRTdGF0ZShtX2ZyYW1lLCBWOFByb3h5Ojpt YWluV29ybGRDb250ZXh0KG1fZnJhbWUpKSk7CisgICAgcmV0dXJuIG1fc2NyaXB0U3RhdGUuZ2V0 KCk7Cit9CisKIHN0YXRpYyBOUE9iamVjdCogY3JlYXRlTm9TY3JpcHRPYmplY3QoKQogewogICAg IG5vdEltcGxlbWVudGVkKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Njcmlw dENvbnRyb2xsZXIuaCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oCmlu ZGV4IGFhMGU0NjcuLmM2MDQyMDUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2Ny aXB0Q29udHJvbGxlci5oCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxl ci5oCkBAIC00OCw2ICs0OCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBGcmFt ZTsKICAgICBjbGFzcyBIVE1MUGx1Z0luRWxlbWVudDsKICAgICBjbGFzcyBTY3JpcHRTb3VyY2VD b2RlOworICAgIGNsYXNzIFNjcmlwdFN0YXRlOwogICAgIGNsYXNzIFN0cmluZzsKICAgICBjbGFz cyBXaWRnZXQ7CiAgICAgY2xhc3MgWFNTQXVkaXRvcjsKQEAgLTE3MCw2ICsxNzEsOSBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgZXZhbHVhdGVJbldvcmxkKGNvbnN0IFNjcmlw dFNvdXJjZUNvZGUmLCBET01XcmFwcGVyV29ybGQqKSB7IH0KICAgICAgICAgc3RhdGljIHZvaWQg Z2V0QWxsV29ybGRzKFZlY3RvcjxET01XcmFwcGVyV29ybGQqPiYgd29ybGRzKTsKIAorICAgICAg ICAvLyBTY3JpcHQgc3RhdGUgZm9yIHRoZSBtYWluIHdvcmxkIGNvbnRleHQuCisgICAgICAgIFNj cmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSgpOworCiAgICAgcHJpdmF0ZToKICAgICAgICAgRnJhbWUq IG1fZnJhbWU7CiAgICAgICAgIGNvbnN0IFN0cmluZyogbV9zb3VyY2VVUkw7CkBAIC0xOTIsNiAr MTk2LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogI2VuZGlmCiAgICAgICAgIC8vIFRoZSBYU1NB dWRpdG9yIGFzc29jaWF0ZWQgd2l0aCB0aGlzIFNjcmlwdENvbnRyb2xsZXIuCiAgICAgICAgIE93 blB0cjxYU1NBdWRpdG9yPiBtX1hTU0F1ZGl0b3I7CisKKyAgICAgICAgLy8gU2NyaXB0IHN0YXRl IGZvciB0aGUgbWFpbiB3b3JsZCBjb250ZXh0LgorICAgICAgICBPd25QdHI8U2NyaXB0U3RhdGU+ IG1fc2NyaXB0U3RhdGU7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTdGF0ZS5jcHAgYi9XZWJDb3JlL2JpbmRp bmdzL3Y4L1NjcmlwdFN0YXRlLmNwcAppbmRleCAwYjVjZDA4Li4xMDMwMThjIDEwMDY0NAotLS0g YS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmNwcAorKysgYi9XZWJDb3JlL2JpbmRp bmdzL3Y4L1NjcmlwdFN0YXRlLmNwcApAQCAtNjgsOSArNjgsOCBAQCBTY3JpcHRTdGF0ZSogc2Ny aXB0U3RhdGVGcm9tTm9kZShET01XcmFwcGVyV29ybGQqLCBOb2RlKiBub2RlKQogCiBTY3JpcHRT dGF0ZSogc2NyaXB0U3RhdGVGcm9tUGFnZShET01XcmFwcGVyV29ybGQqLCBQYWdlKiBwYWdlKQog ewotICAgIC8vIFRoaXMgc2hvdWxkIGJlIG5ldmVyIHJlYWNoZWQgd2l0aCBWOCBiaW5kaW5ncy4K LSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gMDsKKyAgICAvLyBUaGlzIHNo b3VsZCBiZSBvbmx5IHJlYWNoZWQgd2l0aCBWOCBiaW5kaW5ncyBmcm9tIHNpbmdsZSBwcm9jZXNz IGxheW91dCB0ZXN0cy4KKyAgICByZXR1cm4gcGFnZS0+bWFpbkZyYW1lKCktPnNjcmlwdCgpLT5z Y3JpcHRTdGF0ZSgpOwogfQogCiAvLyBGSVhNRTogU3R1YiBtZXRob2Qgc28gd2UgY29tcGlsZS4g IEN1cnJlbnRseSBjYWxsZWQgZnJvbSBGcmFtZUxvYWRlci5jcHAuCg== 44080 2009-12-01 08:08:18 -0800 2009-12-01 08:09:31 -0800 patch addressing comments that I'm going to land script-state3.patch text/plain 3304 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGEwMTI1YS4uZTNiNzlkYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMi0wMSAgWXVyeSBTZW1pa2hh dHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBQcm92aWRlIGEgd2F5IHRvIGdldCBTY3JpcHRTdGF0ZSBmb3Ig dGhlIGluc3BlY3RlZCBwYWdlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zMjAyMAorCisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0Q29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjptYWluV29ybGRT Y3JpcHRTdGF0ZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oOgor ICAgICAgICAqIGJpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnNjcmlwdFN0YXRlRnJvbVBhZ2UpOgorCiAyMDA5LTEyLTAxICBDaHJpcyBNYXJyaW4gIDxjbWFy cmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5jcHAgYi9XZWJDb3Jl L2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IGRkMjdkYzkuLmQ4OTI2Zjgg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5jcHAKKysr IGIvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcApAQCAtNDcsNiArNDcs NyBAQAogI2luY2x1ZGUgIm5wcnVudGltZV9wcml2LmgiCiAjaW5jbHVkZSAiTlBWOE9iamVjdC5o IgogI2luY2x1ZGUgIlNjcmlwdFNvdXJjZUNvZGUuaCIKKyNpbmNsdWRlICJTY3JpcHRTdGF0ZS5o IgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiVjhCaW5kaW5nLmgiCiAjaW5jbHVk ZSAiVjhOUE9iamVjdC5oIgpAQCAtMzU0LDYgKzM1NSwxMyBAQCB2b2lkIFNjcmlwdENvbnRyb2xs ZXI6OmdldEFsbFdvcmxkcyhWZWN0b3I8RE9NV3JhcHBlcldvcmxkKj4mIHdvcmxkcykKICAgICB3 b3JsZHMuYXBwZW5kKG1haW5UaHJlYWROb3JtYWxXb3JsZCgpKTsKIH0KIAorU2NyaXB0U3RhdGUq IFNjcmlwdENvbnRyb2xsZXI6Om1haW5Xb3JsZFNjcmlwdFN0YXRlKCkKK3sKKyAgICBpZiAoIW1f bWFpbldvcmxkU2NyaXB0U3RhdGUpCisgICAgICAgIG1fbWFpbldvcmxkU2NyaXB0U3RhdGUuc2V0 KG5ldyBTY3JpcHRTdGF0ZShtX2ZyYW1lLCBWOFByb3h5OjptYWluV29ybGRDb250ZXh0KG1fZnJh bWUpKSk7CisgICAgcmV0dXJuIG1fbWFpbldvcmxkU2NyaXB0U3RhdGUuZ2V0KCk7Cit9CisKIHN0 YXRpYyBOUE9iamVjdCogY3JlYXRlTm9TY3JpcHRPYmplY3QoKQogewogICAgIG5vdEltcGxlbWVu dGVkKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIu aCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oCmluZGV4IGFhMGU0Njcu LmZiN2JiZWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxl ci5oCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oCkBAIC00OCw2 ICs0OCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBGcmFtZTsKICAgICBjbGFz cyBIVE1MUGx1Z0luRWxlbWVudDsKICAgICBjbGFzcyBTY3JpcHRTb3VyY2VDb2RlOworICAgIGNs YXNzIFNjcmlwdFN0YXRlOwogICAgIGNsYXNzIFN0cmluZzsKICAgICBjbGFzcyBXaWRnZXQ7CiAg ICAgY2xhc3MgWFNTQXVkaXRvcjsKQEAgLTE3MCw2ICsxNzEsOSBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIHZvaWQgZXZhbHVhdGVJbldvcmxkKGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUm LCBET01XcmFwcGVyV29ybGQqKSB7IH0KICAgICAgICAgc3RhdGljIHZvaWQgZ2V0QWxsV29ybGRz KFZlY3RvcjxET01XcmFwcGVyV29ybGQqPiYgd29ybGRzKTsKIAorICAgICAgICAvLyBTY3JpcHQg c3RhdGUgZm9yIHRoZSBtYWluIHdvcmxkIGNvbnRleHQuCisgICAgICAgIFNjcmlwdFN0YXRlKiBt YWluV29ybGRTY3JpcHRTdGF0ZSgpOworCiAgICAgcHJpdmF0ZToKICAgICAgICAgRnJhbWUqIG1f ZnJhbWU7CiAgICAgICAgIGNvbnN0IFN0cmluZyogbV9zb3VyY2VVUkw7CkBAIC0xOTIsNiArMTk2 LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogI2VuZGlmCiAgICAgICAgIC8vIFRoZSBYU1NBdWRp dG9yIGFzc29jaWF0ZWQgd2l0aCB0aGlzIFNjcmlwdENvbnRyb2xsZXIuCiAgICAgICAgIE93blB0 cjxYU1NBdWRpdG9yPiBtX1hTU0F1ZGl0b3I7CisKKyAgICAgICAgLy8gU2NyaXB0IHN0YXRlIGZv ciB0aGUgbWFpbiB3b3JsZCBjb250ZXh0LgorICAgICAgICBPd25QdHI8U2NyaXB0U3RhdGU+IG1f bWFpbldvcmxkU2NyaXB0U3RhdGU7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTdGF0ZS5jcHAgYi9XZWJDb3Jl L2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmNwcAppbmRleCAwYjVjZDA4Li41ODU0Y2U5IDEwMDY0 NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmNwcAorKysgYi9XZWJDb3Jl L2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmNwcApAQCAtNjgsOSArNjgsOCBAQCBTY3JpcHRTdGF0 ZSogc2NyaXB0U3RhdGVGcm9tTm9kZShET01XcmFwcGVyV29ybGQqLCBOb2RlKiBub2RlKQogCiBT Y3JpcHRTdGF0ZSogc2NyaXB0U3RhdGVGcm9tUGFnZShET01XcmFwcGVyV29ybGQqLCBQYWdlKiBw YWdlKQogewotICAgIC8vIFRoaXMgc2hvdWxkIGJlIG5ldmVyIHJlYWNoZWQgd2l0aCBWOCBiaW5k aW5ncy4KLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gMDsKKyAgICAvLyBU aGlzIHNob3VsZCBiZSBvbmx5IHJlYWNoZWQgd2l0aCBWOCBiaW5kaW5ncyBmcm9tIHNpbmdsZSBw cm9jZXNzIGxheW91dCB0ZXN0cy4KKyAgICByZXR1cm4gcGFnZS0+bWFpbkZyYW1lKCktPnNjcmlw dCgpLT5tYWluV29ybGRTY3JpcHRTdGF0ZSgpOwogfQogCiAvLyBGSVhNRTogU3R1YiBtZXRob2Qg c28gd2UgY29tcGlsZS4gIEN1cnJlbnRseSBjYWxsZWQgZnJvbSBGcmFtZUxvYWRlci5jcHAuCg==