111212 2013-03-01 12:47:00 -0800 [V8] Rename getWorld() to isolatedWorld(), and getWorldForEnteredContext() to isolatedWorldForEnteredContext() 2013-03-03 16:18:22 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth dcarney japhet mkwst+watchlist webkit.review.bot oldest_to_newest 845418 0 haraken 2013-03-01 12:47:00 -0800 The rename I did in r142424 was wrong. Given that getWorld() returns 0 for the main world, it should be named isolatedWorld(). Similarly, given that getWorldForEnteredContext() returns 0 for the main world, it should be named isolatedWorldForEnteredContext(). 845428 1 191016 haraken 2013-03-01 12:54:11 -0800 Created attachment 191016 Patch 845922 2 191016 abarth 2013-03-02 23:11:01 -0800 Comment on attachment 191016 Patch ok 845943 3 191016 webkit.review.bot 2013-03-02 23:37:32 -0800 Comment on attachment 191016 Patch Rejecting attachment 191016 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', '--bot-id=gce-cq-04', 'build', '--no-clean', '--no-update', '--build-style=release', '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: WebCore/bindings/v8/V8MutationCallback.cpp -o obj/Source/WebCore/bindings/v8/webcore_remaining.V8MutationCallback.o ../../Source/WebCore/bindings/v8/V8MutationCallback.cpp: In constructor 'WebCore::V8MutationCallback::V8MutationCallback(v8::Handle<v8::Object>, WebCore::ScriptExecutionContext*, v8::Handle<v8::Object>, v8::Isolate*)': ../../Source/WebCore/bindings/v8/V8MutationCallback.cpp:41: error: 'getWorld' is not a member of 'WebCore::DOMWrapperWorld' ninja: build stopped: subcommand failed. Full output: http://webkit-commit-queue.appspot.com/results/16899158 846108 4 haraken 2013-03-03 16:07:50 -0800 Committed r144587: <http://trac.webkit.org/changeset/144587> 191016 2013-03-01 12:54:11 -0800 2013-03-03 16:18:22 -0800 Patch bug-111212-20130301125022.patch text/plain 11144 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMyYTAxODUwZWE5YjE1 N2FhOGFjYzg0YThhZDBhZTA0NDM4NDFmNi4uNjdjMjVhN2RmMDVlZDUxMTE4YTg0MzAzZGJmNGE1 OWYzMjJhMzIxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEzLTAzLTAxICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFJlbmFtZSBn ZXRXb3JsZCgpIHRvIGlzb2xhdGVkV29ybGQoKSwgYW5kIGdldFdvcmxkRm9yRW50ZXJlZENvbnRl eHQoKSB0byBpc29sYXRlZFdvcmxkRm9yRW50ZXJlZENvbnRleHQoKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMjEyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHJlbmFtZSBJIGRpZCBpbiByMTQy NDI0IHdhcyB3cm9uZy4gR2l2ZW4gdGhhdCBnZXRXb3JsZCgpIHJldHVybnMgMAorICAgICAgICBm b3IgdGhlIG1haW4gd29ybGQsIGl0IHNob3VsZCBiZSBuYW1lZCBpc29sYXRlZFdvcmxkKCkuIFNp bWlsYXJseSwKKyAgICAgICAgZ2l2ZW4gdGhhdCBnZXRXb3JsZEZvckVudGVyZWRDb250ZXh0KCkg cmV0dXJucyAwIGZvciB0aGUgbWFpbiB3b3JsZCwKKyAgICAgICAgaXQgc2hvdWxkIGJlIG5hbWVk IGlzb2xhdGVkV29ybGRGb3JFbnRlcmVkQ29udGV4dCgpLgorCisgICAgICAgIE5vIHRlc3RzLiBO byBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9DdXN0b21FbGVt ZW50SGVscGVycy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDdXN0b21FbGVtZW50SGVscGVyczo6 aXNGZWF0dXJlQWxsb3dlZCk6CisgICAgICAgICogYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTURhdGFTdG9yZTo6Y3VycmVudCk6CisgICAgICAgICog YmluZGluZ3MvdjgvRE9NV3JhcHBlcldvcmxkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVdy YXBwZXJXb3JsZDo6bWFrZUNvbnRleHRXZWFrKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9ET01X cmFwcGVyV29ybGQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVdyYXBwZXJXb3JsZDo6aXNvbGF0 ZWRXb3JsZCk6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpzaG91bGRCeXBhc3NNYWluV29ybGRD b250ZW50U2VjdXJpdHlQb2xpY3kpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxl cjo6Y3VycmVudFdvcmxkQ29udGV4dCk6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhCaW5kaW5n Lmg6CisgICAgICAgIChXZWJDb3JlOjppc29sYXRlZFdvcmxkRm9yRW50ZXJlZENvbnRleHQpOgor ICAgICAgICAqIGJpbmRpbmdzL3Y4L1dvcmxkQ29udGV4dEhhbmRsZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpXb3JsZENvbnRleHRIYW5kbGU6OldvcmxkQ29udGV4dEhhbmRsZSk6CisgICAgICAg ICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4RG9jdW1lbnRDdXN0b20uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6d3JhcCk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTERvY3VtZW50 Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OndyYXApOgorICAgICAgICAqIGJpbmRpbmdz L3Y4L2N1c3RvbS9WOFNWR0RvY3VtZW50Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ondy YXApOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOFhNTEh0dHBSZXF1ZXN0Q3VzdG9t LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4WE1MSHR0cFJlcXVlc3Q6OmNvbnN0cnVjdG9yQ3Vz dG9tKToKKwogMjAxMy0wMi0yOCAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgW1Y4XSBSZW1vdmUgdGhlIHdvcmxkLT5pc01haW5Xb3JsZCgpIGNoZWNrIGZy b20gbWlub3JHQ1Byb2xvZ3VlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L0N1c3RvbUVsZW1lbnRIZWxwZXJzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L0N1c3RvbUVsZW1lbnRIZWxwZXJzLmNwcAppbmRleCAyNThiOTE0ODY0MzhlYTY2NTY0NDI3YWM1 MDE5MWM1YjM4NTlkYTYxLi41NDhhNjQ3YTE5ZTUyYzMzODdlNjQ5NWJjZmI0ZjQ4ZGE1MmNmODRl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9DdXN0b21FbGVtZW50SGVs cGVycy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvQ3VzdG9tRWxlbWVudEhl bHBlcnMuY3BwCkBAIC0xMTUsNyArMTE1LDcgQEAgYm9vbCBDdXN0b21FbGVtZW50SGVscGVyczo6 aXNGZWF0dXJlQWxsb3dlZChTY3JpcHRTdGF0ZSogc3RhdGUpCiAKIGJvb2wgQ3VzdG9tRWxlbWVu dEhlbHBlcnM6OmlzRmVhdHVyZUFsbG93ZWQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4 dCkKIHsKLSAgICBpZiAoRE9NV3JhcHBlcldvcmxkKiB3b3JsZCA9IERPTVdyYXBwZXJXb3JsZDo6 Z2V0V29ybGQoY29udGV4dCkpCisgICAgaWYgKERPTVdyYXBwZXJXb3JsZCogd29ybGQgPSBET01X cmFwcGVyV29ybGQ6Omlzb2xhdGVkV29ybGQoY29udGV4dCkpCiAgICAgICAgIHJldHVybiB3b3Js ZC0+aXNNYWluV29ybGQoKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9ET01EYXRhU3RvcmUuY3BwCmluZGV4IDY5MTMxNGZiYmE5NzQ3YmE3MDU4Mjgw YmYzYTZmYmRlNzUwYjJlZjguLjYwYWFmN2I1ZWZlMjVkMTNhNjBiNDAxNjIyMjhkZmUxZmQwNzk5 NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmNwcApAQCAt NjYsNyArNjYsNyBAQCBET01EYXRhU3RvcmUqIERPTURhdGFTdG9yZTo6Y3VycmVudCh2ODo6SXNv bGF0ZSogaXNvbGF0ZSkKICAgICAgICAgcmV0dXJuIGRhdGEtPmRvbURhdGFTdG9yZSgpOwogCiAg ICAgaWYgKERPTVdyYXBwZXJXb3JsZDo6aXNvbGF0ZWRXb3JsZHNFeGlzdCgpKSB7Ci0gICAgICAg IERPTVdyYXBwZXJXb3JsZCogaXNvbGF0ZWRXb3JsZCA9IERPTVdyYXBwZXJXb3JsZDo6Z2V0V29y bGQodjg6OkNvbnRleHQ6OkdldEVudGVyZWQoKSk7CisgICAgICAgIERPTVdyYXBwZXJXb3JsZCog aXNvbGF0ZWRXb3JsZCA9IERPTVdyYXBwZXJXb3JsZDo6aXNvbGF0ZWRXb3JsZCh2ODo6Q29udGV4 dDo6R2V0RW50ZXJlZCgpKTsKICAgICAgICAgaWYgKFVOTElLRUxZKCEhaXNvbGF0ZWRXb3JsZCkp CiAgICAgICAgICAgICByZXR1cm4gaXNvbGF0ZWRXb3JsZC0+aXNvbGF0ZWRXb3JsZERPTURhdGFT dG9yZSgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RP TVdyYXBwZXJXb3JsZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01XcmFwcGVy V29ybGQuY3BwCmluZGV4IGM1ZjE2ZDc2MjdmMDEwMzgzN2ZhYjBmODRkNzI3YTExNjVmNzk2YmEu LjVkYTM1NWI5MDQyNTNjMjc0OTI1NDBjNDRkNjZiZmM0ZGE5ZTA3YzIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTVdyYXBwZXJXb3JsZC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NV3JhcHBlcldvcmxkLmNwcApAQCAtODMsNyArODMsNyBA QCBzdGF0aWMgdm9pZCBpc29sYXRlZFdvcmxkV2Vha0NhbGxiYWNrKHY4OjpJc29sYXRlKiBpc29s YXRlLCB2ODo6UGVyc2lzdGVudDx2ODo6Vgogdm9pZCBET01XcmFwcGVyV29ybGQ6Om1ha2VDb250 ZXh0V2Vhayh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0KQogewogICAgIEFTU0VSVChp c0lzb2xhdGVkV29ybGQoKSk7Ci0gICAgQVNTRVJUKGdldFdvcmxkKGNvbnRleHQpID09IHRoaXMp OworICAgIEFTU0VSVChpc29sYXRlZFdvcmxkKGNvbnRleHQpID09IHRoaXMpOwogICAgIHY4OjpJ c29sYXRlKiBpc29sYXRlID0gY29udGV4dC0+R2V0SXNvbGF0ZSgpOwogICAgIHY4OjpQZXJzaXN0 ZW50PHY4OjpDb250ZXh0Pjo6TmV3KGlzb2xhdGUsIGNvbnRleHQpLk1ha2VXZWFrKGlzb2xhdGUs IHRoaXMsIGlzb2xhdGVkV29ybGRXZWFrQ2FsbGJhY2spOwogICAgIC8vIE1hdGNoaW5nIGRlcmVm IGlzIGluIHdlYWsgY2FsbGJhY2suCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9ET01XcmFwcGVyV29ybGQuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTVdy YXBwZXJXb3JsZC5oCmluZGV4IGY3NWZhN2JkYTFkOTE4Mzg5YTNkYTExNzYwYjRmYWQyNGNkZDUx NGQuLjU2ZWM1MGQ1ZTAyNTRkM2Y1NjhhMTU2MTRiN2FkYjQ5NjgxNWViZTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTVdyYXBwZXJXb3JsZC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTVdyYXBwZXJXb3JsZC5oCkBAIC02Miw3ICs2Miw3IEBA IHB1YmxpYzoKICAgICB2b2lkIHNldElzb2xhdGVkV29ybGRGaWVsZCh2ODo6SGFuZGxlPHY4OjpD b250ZXh0Pik7CiAKICAgICBzdGF0aWMgdm9pZCBhc3NlcnRDb250ZXh0SGFzQ29ycmVjdFByb3Rv dHlwZSh2ODo6SGFuZGxlPHY4OjpDb250ZXh0Pik7Ci0gICAgc3RhdGljIERPTVdyYXBwZXJXb3Js ZCogZ2V0V29ybGQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCkKKyAgICBzdGF0aWMg RE9NV3JhcHBlcldvcmxkKiBpc29sYXRlZFdvcmxkKHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IGNv bnRleHQpCiAgICAgewogICAgICAgICBhc3NlcnRDb250ZXh0SGFzQ29ycmVjdFByb3RvdHlwZShj b250ZXh0KTsKICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PERPTVdyYXBwZXJXb3JsZCo+KGNv bnRleHQtPkdldEFsaWduZWRQb2ludGVyRnJvbUVtYmVkZGVyRGF0YSh2OENvbnRleHRJc29sYXRl ZFdvcmxkKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRD b250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xs ZXIuY3BwCmluZGV4IDlmNWM3YjQ2YzY0NmM2ZTc4ZjQ4ZmI2ZGUyOWY1ZjE1N2RkMDYyYTUuLjc5 OTQyZjg4OTc3OGZlZDk0NzRlNjc4YjBkNDg0OTMwMmYyZmQ4MmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwCkBAIC00MTgsNyArNDE4LDcg QEAgdm9pZCBTY3JpcHRDb250cm9sbGVyOjpldmFsdWF0ZUluSXNvbGF0ZWRXb3JsZChpbnQgd29y bGRJRCwgY29uc3QgVmVjdG9yPFNjcmlwdFMKIAogYm9vbCBTY3JpcHRDb250cm9sbGVyOjpzaG91 bGRCeXBhc3NNYWluV29ybGRDb250ZW50U2VjdXJpdHlQb2xpY3koKQogewotICAgIGlmIChET01X cmFwcGVyV29ybGQqIHdvcmxkID0gd29ybGRGb3JFbnRlcmVkQ29udGV4dCgpKQorICAgIGlmIChE T01XcmFwcGVyV29ybGQqIHdvcmxkID0gaXNvbGF0ZWRXb3JsZEZvckVudGVyZWRDb250ZXh0KCkp CiAgICAgICAgIHJldHVybiB3b3JsZC0+aXNvbGF0ZWRXb3JsZEhhc0NvbnRlbnRTZWN1cml0eVBv bGljeSgpOwogICAgIHJldHVybiBmYWxzZTsKIH0KQEAgLTQ0Niw3ICs0NDYsNyBAQCB2ODo6TG9j YWw8djg6OkNvbnRleHQ+IFNjcmlwdENvbnRyb2xsZXI6OmN1cnJlbnRXb3JsZENvbnRleHQoKQog ICAgICAgICByZXR1cm4gY29udGV4dEZvcldvcmxkKHRoaXMsIG1haW5UaHJlYWROb3JtYWxXb3Js ZCgpKTsKIAogICAgIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IGNvbnRleHQgPSB2ODo6Q29udGV4 dDo6R2V0RW50ZXJlZCgpOwotICAgIERPTVdyYXBwZXJXb3JsZCogaXNvbGF0ZWRXb3JsZCA9IERP TVdyYXBwZXJXb3JsZDo6Z2V0V29ybGQoY29udGV4dCk7CisgICAgRE9NV3JhcHBlcldvcmxkKiBp c29sYXRlZFdvcmxkID0gRE9NV3JhcHBlcldvcmxkOjppc29sYXRlZFdvcmxkKGNvbnRleHQpOwog ICAgIGlmICghaXNvbGF0ZWRXb3JsZCkKICAgICAgICAgcmV0dXJuIGNvbnRleHRGb3JXb3JsZCh0 aGlzLCBtYWluVGhyZWFkTm9ybWFsV29ybGQoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv VjhCaW5kaW5nLmgKaW5kZXggNzY2ZGMyNDFlYjhhMzVkYTc3OThlODZlMjI4MGY4ZTQ0MzNlZTBl ZC4uZmMxZDliOWIxNWQyNDdiMzViZGU4Nzk4MGExNzM1MTFmMjkzYzgwYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhCaW5kaW5nLmgKKysrIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvVjhCaW5kaW5nLmgKQEAgLTQ0MiwxMiArNDQyLDEyIEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAvLyBhIGNvbnRleHQsIGlmIHRoZSB3aW5kb3cgaXMgY3VycmVudGx5 IGJlaW5nIGRpc3BsYXllZCBpbiB0aGUgRnJhbWUuCiAgICAgRnJhbWUqIHRvRnJhbWVJZk5vdERl dGFjaGVkKHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+KTsKIAotICAgIGlubGluZSBET01XcmFwcGVy V29ybGQqIHdvcmxkRm9yRW50ZXJlZENvbnRleHQoKQorICAgIGlubGluZSBET01XcmFwcGVyV29y bGQqIGlzb2xhdGVkV29ybGRGb3JFbnRlcmVkQ29udGV4dCgpCiAgICAgewogICAgICAgICB2ODo6 SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0ID0gdjg6OkNvbnRleHQ6OkdldEVudGVyZWQoKTsK ICAgICAgICAgaWYgKGNvbnRleHQuSXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuIDA7Ci0g ICAgICAgIHJldHVybiBET01XcmFwcGVyV29ybGQ6OmdldFdvcmxkKGNvbnRleHQpOworICAgICAg ICByZXR1cm4gRE9NV3JhcHBlcldvcmxkOjppc29sYXRlZFdvcmxkKGNvbnRleHQpOwogICAgIH0K IAogICAgIC8vIElmIHRoZSBjdXJyZW50IGNvbnRleHQgY2F1c2VzIG91dCBvZiBtZW1vcnksIEph dmFTY3JpcHQgc2V0dGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv V29ybGRDb250ZXh0SGFuZGxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmxk Q29udGV4dEhhbmRsZS5jcHAKaW5kZXggNDg2MjZmYzA0ZjdiNWU0ZmMyNGYxOTEyOTk1NTAyZTM3 YmZjYzkzNi4uN2M1OTFhOGY0ZDUyZjBhZDhiOTViNGY1YzQyZmU5MTRjYjg3YTdlOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvV29ybGRDb250ZXh0SGFuZGxlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JsZENvbnRleHRIYW5kbGUuY3BwCkBA IC02Myw3ICs2Myw3IEBAIFdvcmxkQ29udGV4dEhhbmRsZTo6V29ybGRDb250ZXh0SGFuZGxlKFdv cmxkVG9Vc2Ugd29ybGRUb1VzZSkKICAgICB9CiAjZW5kaWYKIAotICAgIGlmIChET01XcmFwcGVy V29ybGQ6OmdldFdvcmxkKGNvbnRleHQpKSB7CisgICAgaWYgKERPTVdyYXBwZXJXb3JsZDo6aXNv bGF0ZWRXb3JsZChjb250ZXh0KSkgewogICAgICAgICBtX2NvbnRleHQgPSBTaGFyZWRQZXJzaXN0 ZW50PHY4OjpDb250ZXh0Pjo6Y3JlYXRlKGNvbnRleHQpOwogICAgICAgICByZXR1cm47CiAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RG9jdW1l bnRDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RG9jdW1l bnRDdXN0b20uY3BwCmluZGV4IDJlMGRhZDhkMjMwYWQyMzg1NzI2OTI3ZTgwNjlmZWFkZjFiNzZh MjguLjYwOGU3MDg0ZWUwNWYxZjU2MjljNDhlM2U2YWY1YzZmNjQwMjQ0ODcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERvY3VtZW50Q3VzdG9tLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEb2N1bWVudEN1c3RvbS5j cHAKQEAgLTEwMSw3ICsxMDEsNyBAQCB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHdyYXAoRG9jdW1l bnQqIGltcGwsIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gY3JlYXRpb25Db250ZQogICAgIHY4OjpI YW5kbGU8djg6Ok9iamVjdD4gd3JhcHBlciA9IFY4RG9jdW1lbnQ6OmNyZWF0ZVdyYXBwZXIoaW1w bCwgY3JlYXRpb25Db250ZXh0LCBpc29sYXRlKTsKICAgICBpZiAod3JhcHBlci5Jc0VtcHR5KCkp CiAgICAgICAgIHJldHVybiB3cmFwcGVyOwotICAgIGlmICghd29ybGRGb3JFbnRlcmVkQ29udGV4 dCgpKSB7CisgICAgaWYgKCFpc29sYXRlZFdvcmxkRm9yRW50ZXJlZENvbnRleHQoKSkgewogICAg ICAgICBpZiAoRnJhbWUqIGZyYW1lID0gaW1wbC0+ZnJhbWUoKSkKICAgICAgICAgICAgIGZyYW1l LT5zY3JpcHQoKS0+d2luZG93U2hlbGwobWFpblRocmVhZE5vcm1hbFdvcmxkKCkpLT51cGRhdGVE b2N1bWVudFdyYXBwZXIod3JhcHBlcik7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTERvY3VtZW50Q3VzdG9tLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxEb2N1bWVudEN1c3RvbS5jcHAKaW5kZXgg NWMxZjY1ZmY1MTlkYTJlYzU3ODdlNDcyMDBlNzA2NThmYWNhODIxNC4uZWQ1OTdhOWM4ZTEzZjk1 MDkzZTliMTc3MDMzYWViMWM5ZTA5OTg3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTERvY3VtZW50Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRG9jdW1lbnRDdXN0b20uY3BwCkBAIC0xNzEs NyArMTcxLDcgQEAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiB3cmFwKEhUTUxEb2N1bWVudCogaW1w bCwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBjcmVhdGlvbkMKICAgICB2ODo6SGFuZGxlPHY4OjpP YmplY3Q+IHdyYXBwZXIgPSBWOEhUTUxEb2N1bWVudDo6Y3JlYXRlV3JhcHBlcihpbXBsLCBjcmVh dGlvbkNvbnRleHQsIGlzb2xhdGUpOwogICAgIGlmICh3cmFwcGVyLklzRW1wdHkoKSkKICAgICAg ICAgcmV0dXJuIHdyYXBwZXI7Ci0gICAgaWYgKCF3b3JsZEZvckVudGVyZWRDb250ZXh0KCkpIHsK KyAgICBpZiAoIWlzb2xhdGVkV29ybGRGb3JFbnRlcmVkQ29udGV4dCgpKSB7CiAgICAgICAgIGlm IChGcmFtZSogZnJhbWUgPSBpbXBsLT5mcmFtZSgpKQogICAgICAgICAgICAgZnJhbWUtPnNjcmlw dCgpLT53aW5kb3dTaGVsbChtYWluVGhyZWFkTm9ybWFsV29ybGQoKSktPnVwZGF0ZURvY3VtZW50 V3JhcHBlcih3cmFwcGVyKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9jdXN0b20vVjhTVkdEb2N1bWVudEN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhTVkdEb2N1bWVudEN1c3RvbS5jcHAKaW5kZXggMzU5OTFlZTE1 ODYyMzM3MjM3Y2EwMmQ2MWVhNzUzNjE2MmY5OTFlYy4uYjVlZjNmYTZhYjQzMGU2MTI1YzU5OTk3 ODY5YjM4MGFmODZhZjMzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4U1ZHRG9jdW1lbnRDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOFNWR0RvY3VtZW50Q3VzdG9tLmNwcApAQCAtNDQsNyArNDQsNyBAQCB2 ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHdyYXAoU1ZHRG9jdW1lbnQqIGltcGwsIHY4OjpIYW5kbGU8 djg6Ok9iamVjdD4gY3JlYXRpb25DbwogICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd3JhcHBl ciA9IFY4U1ZHRG9jdW1lbnQ6OmNyZWF0ZVdyYXBwZXIoaW1wbCwgY3JlYXRpb25Db250ZXh0LCBp c29sYXRlKTsKICAgICBpZiAod3JhcHBlci5Jc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiB3cmFw cGVyOwotICAgIGlmICghd29ybGRGb3JFbnRlcmVkQ29udGV4dCgpKSB7CisgICAgaWYgKCFpc29s YXRlZFdvcmxkRm9yRW50ZXJlZENvbnRleHQoKSkgewogICAgICAgICBpZiAoRnJhbWUqIGZyYW1l ID0gaW1wbC0+ZnJhbWUoKSkKICAgICAgICAgICAgIGZyYW1lLT5zY3JpcHQoKS0+d2luZG93U2hl bGwobWFpblRocmVhZE5vcm1hbFdvcmxkKCkpLT51cGRhdGVEb2N1bWVudFdyYXBwZXIod3JhcHBl cik7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwCmluZGV4IDYyMTkxNmNmNDc4ODQzODZm Y2E4ZGFlNjIyNTZiNTZmOTE4NGYxZTcuLjFhYWZhNzQyYjFiZDVkMDVlMTM3NDE5YWFlMWMzODE2 NzM1ZTE5MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OFhNTEh0dHBSZXF1ZXN0Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhYTUxIdHRwUmVxdWVzdEN1c3RvbS5jcHAKQEAgLTU0LDcgKzU0LDcgQEAgdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IFY4WE1MSHR0cFJlcXVlc3Q6OmNvbnN0cnVjdG9yQ3VzdG9tKGNv bnN0IHY4OjpBcmd1bWVudHMmIGEKIAogICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4gc2VjdXJp dHlPcmlnaW47CiAgICAgaWYgKGNvbnRleHQtPmlzRG9jdW1lbnQoKSkgewotICAgICAgICBpZiAo RE9NV3JhcHBlcldvcmxkKiB3b3JsZCA9IHdvcmxkRm9yRW50ZXJlZENvbnRleHQoKSkKKyAgICAg ICAgaWYgKERPTVdyYXBwZXJXb3JsZCogd29ybGQgPSBpc29sYXRlZFdvcmxkRm9yRW50ZXJlZENv bnRleHQoKSkKICAgICAgICAgICAgIHNlY3VyaXR5T3JpZ2luID0gd29ybGQtPmlzb2xhdGVkV29y bGRTZWN1cml0eU9yaWdpbigpOwogICAgIH0KIAo=