27277 2009-07-14 15:38:12 -0700 [V8] Fix isolated world wrappers for Node prototypes 2009-07-15 09:28:08 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 abarth abarth aa abarth dglazkov levin oldest_to_newest 131712 0 abarth 2009-07-14 15:38:12 -0700 The next step is to fix the prototype chains for node prototypes in isolated worlds. Patch forthcoming. 131717 1 32740 abarth 2009-07-14 15:48:59 -0700 Created attachment 32740 patch Sorry for the goofy diff format. I'm working out of an improvised git repo in my Chromium tree. 131719 2 32741 abarth 2009-07-14 15:54:02 -0700 Created attachment 32741 patch Oops. The previous version was slightly old. 131723 3 32741 dglazkov 2009-07-14 15:56:26 -0700 Comment on attachment 32741 patch sounds good. 131724 4 levin 2009-07-14 16:00:29 -0700 static v8::Handle<v8::Context> V8DOMWrapper::getWrapperContext(Frame* frame); Not: Remove the param name "frame". 131730 5 abarth 2009-07-14 16:06:23 -0700 Assigning to myself for landing. 131757 6 abarth 2009-07-14 17:11:10 -0700 Sending WebCore/ChangeLog Sending WebCore/bindings/v8/V8DOMWrapper.cpp Sending WebCore/bindings/v8/V8DOMWrapper.h Transmitting file data ... Committed revision 45884. 131916 7 dglazkov 2009-07-15 09:28:08 -0700 Fix landed as http://trac.webkit.org/changeset/45916. 32740 2009-07-14 15:48:59 -0700 2009-07-14 15:54:02 -0700 patch node-proto.patch text/plain 6087 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTg3NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMDktMDctMTQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbVjhd IEZpeCBpc29sYXRlZCB3b3JsZCB3cmFwcGVycyBmb3IgTm9kZSBwcm90b3R5cGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzI3NworCisgICAgICAg IFRoaXMgY2hhbmdlIGRvZXMgdHdvIHRoaW5nczoKKworICAgICAgICAxKSBXZSBieXBhc3MgdGhl IHdyYXBwZXIgY2FjaGUgaW4gdGhlIGlzb2xhdGVkIHdvcmxkLiAgVGhpcyBpcyBiZWNhdXNlCisg ICAgICAgICAgIHRoZSB3cmFwcGVyIHRlbXBsYXRlIGNhY2hlIGhhcyBwcm90b3R5cGVzIHRoYXQg bGVhZCB0byB0aGUgbWFpbgorICAgICAgICAgICB3b3JsZC4gIFdlIGNhbiBhZGQgYSB0ZW1wbGF0 ZSBjYWNoZSBmb3IgdGhlIGlzb2xhdGVkIHdvcmxkIGlmCisgICAgICAgICAgIHBlcmZvcm1hbmNl IHdhcnJlbnRzLgorCisgICAgICAgIDIpIFdlIGludHJvZHVjZSBhIHNtYXJ0ZXIgd2F5IHRvIGdy YWIgdGhlIHdyYXBwZXIgY29udGV4dCBmb3IgYSBmcmFtZQorICAgICAgICAgICB0aGF0IGlzIGF3 YXJlIHRoYXQgcHJveHkgPC0+IGNvbnRleHQgZG8gbm90IHN0YW5kIGluIG9uZS10by1vbmUKKyAg ICAgICAgICAgY29vcmVzcG9uZGFuY2UuICBUaGlzIGdlbmVyYWxpemVzIG91ciBzb2x1dGlvbiBm b3IgdGhlIG5vZGUgd3JhcHBlcgorICAgICAgICAgICBjYXNlIHRvIHByb3RvdHlwZXMuCisKKyAg ICAgICAgVGhlIG5ldCByZXN1bHQgaXMgdGhhdCBOb2RlIHdyYXBwZXJzIGdldCB0aGUgcmlnaHQg cHJvdG90eXBlcy4gIEFzCisgICAgICAgIGJlZm9yZSwgdGVzdHMgdG8gZm9sbG93LgorCisgICAg ICAgICogYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4 RE9NV3JhcHBlcjo6c2V0SGlkZGVuV2luZG93UmVmZXJlbmNlKToKKyAgICAgICAgKFdlYkNvcmU6 OlY4RE9NV3JhcHBlcjo6aW5zdGFudGlhdGVWOE9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpW OERPTVdyYXBwZXI6OmNvbnZlcnROb2RlVG9WOE9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpW OERPTVdyYXBwZXI6OmNvbnZlcnRXaW5kb3dUb1Y4T2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6 OlY4RE9NV3JhcHBlcjo6Z2V0V3JhcHBlckNvbnRleHQpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4 L1Y4RE9NV3JhcHBlci5oOgorCiAyMDA5LTA3LTE0ICBBbGJlcnQgSi4gV29uZyAgPGFqd29uZ0Bj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZm IC0tZ2l0IGEvdjgvVjhET01XcmFwcGVyLmNwcCBiL3Y4L1Y4RE9NV3JhcHBlci5jcHAKaW5kZXgg MGI1YTdiZS4uOGRiNDZkMiAxMDA3NTUKLS0tIGEvdjgvVjhET01XcmFwcGVyLmNwcAorKysgYi92 OC9WOERPTVdyYXBwZXIuY3BwCkBAIC01NzgsMTkgKzU3OCwxMyBAQCB2b2lkIFY4RE9NV3JhcHBl cjo6c2V0SGlkZGVuV2luZG93UmVmZXJlbmNlKEZyYW1lKiBmcmFtZSwgY29uc3QgaW50IGludGVy bmFsSW5kZQogICAgIC8vIEdldCBET01XaW5kb3cKICAgICBpZiAoIWZyYW1lKQogICAgICAgICBy ZXR1cm47IC8vIE9iamVjdCBtaWdodCBiZSBkZXRhY2hlZCBmcm9tIHdpbmRvdwotICAgIHY4OjpI YW5kbGU8djg6OkNvbnRleHQ+IHY4Q29udGV4dCA9IFY4UHJveHk6OmNvbnRleHQoZnJhbWUpOwot ICAgIGlmICh2OENvbnRleHQuSXNFbXB0eSgpKQorICAgIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+ IGNvbnRleHQgPSBnZXRXcmFwcGVyQ29udGV4dChmcmFtZSk7CisgICAgaWYgKGNvbnRleHQuSXNF bXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoVjhJc29sYXRlZFdvcmxkKiB3b3Js ZCA9IFY4SXNvbGF0ZWRXb3JsZDo6Z2V0RW50ZXJlZCgpKSB7Ci0gICAgICAgdjhDb250ZXh0ID0g d29ybGQtPmNvbnRleHQoKTsKLSAgICAgICBpZiAoZnJhbWUgIT0gVjhQcm94eTo6cmV0cmlldmVG cmFtZSh2OENvbnRleHQpKQotICAgICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgQVNTRVJU KGludGVybmFsSW5kZXggPCBWOEN1c3RvbTo6a0RPTVdpbmRvd0ludGVybmFsRmllbGRDb3VudCk7 CiAKLSAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGdsb2JhbCA9IHY4Q29udGV4dC0+R2xvYmFs KCk7CisgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBnbG9iYWwgPSBjb250ZXh0LT5HbG9iYWwo KTsKICAgICAvLyBMb29rIGZvciByZWFsIERPTSB3cmFwcGVyLgogICAgIGdsb2JhbCA9IFY4RE9N V3JhcHBlcjo6bG9va3VwRE9NV3JhcHBlcihWOENsYXNzSW5kZXg6OkRPTVdJTkRPVywgZ2xvYmFs KTsKICAgICBBU1NFUlQoIWdsb2JhbC5Jc0VtcHR5KCkpOwpAQCAtNjk0LDE2ICs2ODgsMjIgQEAg djg6OkxvY2FsPHY4OjpPYmplY3Q+IFY4RE9NV3JhcHBlcjo6aW5zdGFudGlhdGVWOE9iamVjdChW OFByb3h5KiBwcm94eSwgVjhDbGFzc0kKIAogICAgIGlmICghcHJveHkpCiAgICAgICAgIFY4UHJv eHkqIHByb3h5ID0gVjhQcm94eTo6cmV0cmlldmUoKTsKKyAgICBpZiAoVjhJc29sYXRlZFdvcmxk OjpnZXRFbnRlcmVkKCkpIHsKKyAgICAgICAgLy8gVGhpcyBlZmZlY3RpdmVseSBkaXNhYmxlcyB0 aGUgd3JhcHBlciBjYWNoZSBmb3IgaXNvbGF0ZWQgd29ybGRzLgorICAgICAgICBwcm94eSA9IDA7 CisgICAgICAgIC8vIEZJWE1FOiBEbyB3ZSBuZWVkIGEgd3JhcHBlciBjYWNoZSBmb3IgdGhlIGlz b2xhdGVkIHdvcmxkPyAgV2Ugc2hvdWxkCisgICAgICAgIC8vIHNlZSBpZiB0aGUgcGVyZm9ybWFu Y2UgZ2FpbnMgYXJlIHdvcnRoIHdoaWxlLgorICAgIH0KICAgICB2ODo6TG9jYWw8djg6Ok9iamVj dD4gaW5zdGFuY2U7CiAgICAgaWYgKHByb3h5KQogICAgICAgICBpbnN0YW5jZSA9IHByb3h5LT5j cmVhdGVXcmFwcGVyRnJvbUNhY2hlKGRlc2NyaXB0b3JUeXBlKTsKICAgICBlbHNlIHsKLSAgICAg ICAgdjg6OkxvY2FsPHY4OjpGdW5jdGlvbj4gZnVuY3Rpb24gPSBWOERPTVdyYXBwZXI6OmdldFRl bXBsYXRlKGRlc2NyaXB0b3JUeXBlKS0+R2V0RnVuY3Rpb24oKTsKKyAgICAgICAgdjg6OkxvY2Fs PHY4OjpGdW5jdGlvbj4gZnVuY3Rpb24gPSBnZXRUZW1wbGF0ZShkZXNjcmlwdG9yVHlwZSktPkdl dEZ1bmN0aW9uKCk7CiAgICAgICAgIGluc3RhbmNlID0gU2FmZUFsbG9jYXRpb246Om5ld0luc3Rh bmNlKGZ1bmN0aW9uKTsKICAgICB9CiAgICAgaWYgKCFpbnN0YW5jZS5Jc0VtcHR5KCkpIHsKICAg ICAgICAgLy8gQXZvaWQgc2V0dGluZyB0aGUgRE9NIHdyYXBwZXIgZm9yIGZhaWxlZCBhbGxvY2F0 aW9ucy4KLSAgICAgICAgVjhET01XcmFwcGVyOjpzZXRET01XcmFwcGVyKGluc3RhbmNlLCBWOENs YXNzSW5kZXg6OlRvSW50KGNwdHJUeXBlKSwgaW1wbCk7CisgICAgICAgIHNldERPTVdyYXBwZXIo aW5zdGFuY2UsIFY4Q2xhc3NJbmRleDo6VG9JbnQoY3B0clR5cGUpLCBpbXBsKTsKICAgICB9CiAg ICAgcmV0dXJuIGluc3RhbmNlOwogfQpAQCAtMTEyOCwxOSArMTEyOCwxNyBAQCB2ODo6SGFuZGxl PHY4OjpWYWx1ZT4gVjhET01XcmFwcGVyOjpjb252ZXJ0Tm9kZVRvVjhPYmplY3QoTm9kZSogbm9k ZSkKICAgICAgICAgQVNTRVJUKHR5cGUgIT0gVjhDbGFzc0luZGV4OjpJTlZBTElEX0NMQVNTX0lO REVYKTsKICAgICB9CiAKLSAgICB2ODo6TG9jYWw8djg6OkNvbnRleHQ+IHY4Q29udGV4dDsKLSAg ICBpZiAocHJveHkpCi0gICAgICAgIHY4Q29udGV4dCA9IHByb3h5LT5jb250ZXh0KCk7CisgICAg djg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCA9IGdldFdyYXBwZXJDb250ZXh0KHByb3h5 LT5mcmFtZSgpKTsKIAogICAgIC8vIEVudGVyIHRoZSBub2RlJ3MgY29udGV4dCBhbmQgY3JlYXRl IHRoZSB3cmFwcGVyIGluIHRoYXQgY29udGV4dC4KLSAgICBpZiAoIXY4Q29udGV4dC5Jc0VtcHR5 KCkpCi0gICAgICAgIHY4Q29udGV4dC0+RW50ZXIoKTsKKyAgICBpZiAoIWNvbnRleHQuSXNFbXB0 eSgpKQorICAgICAgICBjb250ZXh0LT5FbnRlcigpOwogCiAgICAgdjg6OkxvY2FsPHY4OjpPYmpl Y3Q+IHJlc3VsdCA9IGluc3RhbnRpYXRlVjhPYmplY3QocHJveHksIHR5cGUsIFY4Q2xhc3NJbmRl eDo6Tk9ERSwgbm9kZSk7CiAKICAgICAvLyBFeGl0IHRoZSBub2RlJ3MgY29udGV4dCBpZiBpdCB3 YXMgZW50ZXJlZC4KLSAgICBpZiAoIXY4Q29udGV4dC5Jc0VtcHR5KCkpCi0gICAgICAgIHY4Q29u dGV4dC0+RXhpdCgpOworICAgIGlmICghY29udGV4dC5Jc0VtcHR5KCkpCisgICAgICAgIGNvbnRl eHQtPkV4aXQoKTsKIAogICAgIGlmIChyZXN1bHQuSXNFbXB0eSgpKSB7CiAgICAgICAgIC8vIElm IGluc3RhbnRpYXRpb24gZmFpbGVkIGl0J3MgaW1wb3J0YW50IG5vdCB0byBhZGQgdGhlIHJlc3Vs dApAQCAtMTM5MCwxMyArMTM4OCwyOCBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhET01XcmFw cGVyOjpjb252ZXJ0V2luZG93VG9WOE9iamVjdChET01XaW5kb3cqIHdpbmRvdykKICAgICB9CiAK ICAgICAvLyBPdGhlcndpc2UsIHJldHVybiB0aGUgZ2xvYmFsIG9iamVjdCBhc3NvY2lhdGVkIHdp dGggdGhpcyBmcmFtZS4KLSAgICB2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiB2OENvbnRleHQgPSBW OFByb3h5Ojpjb250ZXh0KGZyYW1lKTsKLSAgICBpZiAodjhDb250ZXh0LklzRW1wdHkoKSkKKyAg ICB2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0ID0gZ2V0V3JhcHBlckNvbnRleHQoZnJh bWUpOworICAgIGlmIChjb250ZXh0LklzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHY4OjpIYW5k bGU8djg6Ok9iamVjdD4oKTsKIAotICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2xvYmFsID0g djhDb250ZXh0LT5HbG9iYWwoKTsKKyAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGdsb2JhbCA9 IGNvbnRleHQtPkdsb2JhbCgpOwogICAgIEFTU0VSVCghZ2xvYmFsLklzRW1wdHkoKSk7CiAgICAg cmV0dXJuIGdsb2JhbDsKIH0KIAordjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gVjhET01XcmFwcGVy OjpnZXRXcmFwcGVyQ29udGV4dChGcmFtZSogZnJhbWUpCit7CisgICAgdjg6OkhhbmRsZTx2ODo6 Q29udGV4dD4gY29udGV4dCA9IFY4UHJveHk6OmNvbnRleHQoZnJhbWUpOworICAgIGlmIChjb250 ZXh0LklzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+KCk7 CisKKyAgICBpZiAoVjhJc29sYXRlZFdvcmxkKiB3b3JsZCA9IFY4SXNvbGF0ZWRXb3JsZDo6Z2V0 RW50ZXJlZCgpKSB7CisgICAgICAgY29udGV4dCA9IHdvcmxkLT5jb250ZXh0KCk7CisgICAgICAg aWYgKGZyYW1lICE9IFY4UHJveHk6OnJldHJpZXZlRnJhbWUoY29udGV4dCkpCisgICAgICAgICAg cmV0dXJuIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+KCk7CisgICAgfQorCisgICAgcmV0dXJuIGNv bnRleHQ7Cit9CisKIH0gIC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS92OC9WOERP TVdyYXBwZXIuaCBiL3Y4L1Y4RE9NV3JhcHBlci5oCmluZGV4IGM3MDg1OTEuLjY2ZjE5NDggMTAw NzU1Ci0tLSBhL3Y4L1Y4RE9NV3JhcHBlci5oCisrKyBiL3Y4L1Y4RE9NV3JhcHBlci5oCkBAIC0y MzUsNiArMjM1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHN0YXRpYyB2ODo6 TG9jYWw8djg6Ok9iamVjdD4gaW5zdGFudGlhdGVWOE9iamVjdChWOFByb3h5KiwgVjhDbGFzc0lu ZGV4OjpWOFdyYXBwZXJUeXBlLCBWOENsYXNzSW5kZXg6OlY4V3JhcHBlclR5cGUsIHZvaWQqKTsK IAorICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gVjhET01XcmFwcGVyOjpn ZXRXcmFwcGVyQ29udGV4dChGcmFtZSogZnJhbWUpOwogICAgIH07CiAKIH0K 32741 2009-07-14 15:54:02 -0700 2009-07-14 15:56:26 -0700 patch node-proto.patch text/plain 6105 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTg3NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMDktMDctMTQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbVjhd IEZpeCBpc29sYXRlZCB3b3JsZCB3cmFwcGVycyBmb3IgTm9kZSBwcm90b3R5cGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzI3NworCisgICAgICAg IFRoaXMgY2hhbmdlIGRvZXMgdHdvIHRoaW5nczoKKworICAgICAgICAxKSBXZSBieXBhc3MgdGhl IHdyYXBwZXIgY2FjaGUgaW4gdGhlIGlzb2xhdGVkIHdvcmxkLiAgVGhpcyBpcyBiZWNhdXNlCisg ICAgICAgICAgIHRoZSB3cmFwcGVyIHRlbXBsYXRlIGNhY2hlIGhhcyBwcm90b3R5cGVzIHRoYXQg bGVhZCB0byB0aGUgbWFpbgorICAgICAgICAgICB3b3JsZC4gIFdlIGNhbiBhZGQgYSB0ZW1wbGF0 ZSBjYWNoZSBmb3IgdGhlIGlzb2xhdGVkIHdvcmxkIGlmCisgICAgICAgICAgIHBlcmZvcm1hbmNl IHdhcnJlbnRzLgorCisgICAgICAgIDIpIFdlIGludHJvZHVjZSBhIHNtYXJ0ZXIgd2F5IHRvIGdy YWIgdGhlIHdyYXBwZXIgY29udGV4dCBmb3IgYSBmcmFtZQorICAgICAgICAgICB0aGF0IGlzIGF3 YXJlIHRoYXQgcHJveHkgPC0+IGNvbnRleHQgZG8gbm90IHN0YW5kIGluIG9uZS10by1vbmUKKyAg ICAgICAgICAgY29vcmVzcG9uZGFuY2UuICBUaGlzIGdlbmVyYWxpemVzIG91ciBzb2x1dGlvbiBm b3IgdGhlIG5vZGUgd3JhcHBlcgorICAgICAgICAgICBjYXNlIHRvIHByb3RvdHlwZXMuCisKKyAg ICAgICAgVGhlIG5ldCByZXN1bHQgaXMgdGhhdCBOb2RlIHdyYXBwZXJzIGdldCB0aGUgcmlnaHQg cHJvdG90eXBlcy4gIEFzCisgICAgICAgIGJlZm9yZSwgdGVzdHMgdG8gZm9sbG93LgorCisgICAg ICAgICogYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4 RE9NV3JhcHBlcjo6c2V0SGlkZGVuV2luZG93UmVmZXJlbmNlKToKKyAgICAgICAgKFdlYkNvcmU6 OlY4RE9NV3JhcHBlcjo6aW5zdGFudGlhdGVWOE9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpW OERPTVdyYXBwZXI6OmNvbnZlcnROb2RlVG9WOE9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpW OERPTVdyYXBwZXI6OmNvbnZlcnRXaW5kb3dUb1Y4T2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6 OlY4RE9NV3JhcHBlcjo6Z2V0V3JhcHBlckNvbnRleHQpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4 L1Y4RE9NV3JhcHBlci5oOgorCiAyMDA5LTA3LTE0ICBBbGJlcnQgSi4gV29uZyAgPGFqd29uZ0Bj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZm IC0tZ2l0IGEvdjgvVjhET01XcmFwcGVyLmNwcCBiL3Y4L1Y4RE9NV3JhcHBlci5jcHAKaW5kZXgg MGI1YTdiZS4uZDQ0MmNiZCAxMDA3NTUKLS0tIGEvdjgvVjhET01XcmFwcGVyLmNwcAorKysgYi92 OC9WOERPTVdyYXBwZXIuY3BwCkBAIC01NzgsMTkgKzU3OCwxMyBAQCB2b2lkIFY4RE9NV3JhcHBl cjo6c2V0SGlkZGVuV2luZG93UmVmZXJlbmNlKEZyYW1lKiBmcmFtZSwgY29uc3QgaW50IGludGVy bmFsSW5kZQogICAgIC8vIEdldCBET01XaW5kb3cKICAgICBpZiAoIWZyYW1lKQogICAgICAgICBy ZXR1cm47IC8vIE9iamVjdCBtaWdodCBiZSBkZXRhY2hlZCBmcm9tIHdpbmRvdwotICAgIHY4OjpI YW5kbGU8djg6OkNvbnRleHQ+IHY4Q29udGV4dCA9IFY4UHJveHk6OmNvbnRleHQoZnJhbWUpOwot ICAgIGlmICh2OENvbnRleHQuSXNFbXB0eSgpKQorICAgIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+ IGNvbnRleHQgPSBnZXRXcmFwcGVyQ29udGV4dChmcmFtZSk7CisgICAgaWYgKGNvbnRleHQuSXNF bXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoVjhJc29sYXRlZFdvcmxkKiB3b3Js ZCA9IFY4SXNvbGF0ZWRXb3JsZDo6Z2V0RW50ZXJlZCgpKSB7Ci0gICAgICAgdjhDb250ZXh0ID0g d29ybGQtPmNvbnRleHQoKTsKLSAgICAgICBpZiAoZnJhbWUgIT0gVjhQcm94eTo6cmV0cmlldmVG cmFtZSh2OENvbnRleHQpKQotICAgICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgQVNTRVJU KGludGVybmFsSW5kZXggPCBWOEN1c3RvbTo6a0RPTVdpbmRvd0ludGVybmFsRmllbGRDb3VudCk7 CiAKLSAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGdsb2JhbCA9IHY4Q29udGV4dC0+R2xvYmFs KCk7CisgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBnbG9iYWwgPSBjb250ZXh0LT5HbG9iYWwo KTsKICAgICAvLyBMb29rIGZvciByZWFsIERPTSB3cmFwcGVyLgogICAgIGdsb2JhbCA9IFY4RE9N V3JhcHBlcjo6bG9va3VwRE9NV3JhcHBlcihWOENsYXNzSW5kZXg6OkRPTVdJTkRPVywgZ2xvYmFs KTsKICAgICBBU1NFUlQoIWdsb2JhbC5Jc0VtcHR5KCkpOwpAQCAtNjk0LDE2ICs2ODgsMjIgQEAg djg6OkxvY2FsPHY4OjpPYmplY3Q+IFY4RE9NV3JhcHBlcjo6aW5zdGFudGlhdGVWOE9iamVjdChW OFByb3h5KiBwcm94eSwgVjhDbGFzc0kKIAogICAgIGlmICghcHJveHkpCiAgICAgICAgIFY4UHJv eHkqIHByb3h5ID0gVjhQcm94eTo6cmV0cmlldmUoKTsKKyAgICBpZiAoVjhJc29sYXRlZFdvcmxk OjpnZXRFbnRlcmVkKCkpIHsKKyAgICAgICAgLy8gVGhpcyBlZmZlY3RpdmVseSBkaXNhYmxlcyB0 aGUgd3JhcHBlciBjYWNoZSBmb3IgaXNvbGF0ZWQgd29ybGRzLgorICAgICAgICBwcm94eSA9IDA7 CisgICAgICAgIC8vIEZJWE1FOiBEbyB3ZSBuZWVkIGEgd3JhcHBlciBjYWNoZSBmb3IgdGhlIGlz b2xhdGVkIHdvcmxkPyAgV2Ugc2hvdWxkCisgICAgICAgIC8vIHNlZSBpZiB0aGUgcGVyZm9ybWFu Y2UgZ2FpbnMgYXJlIHdvcnRoIHdoaWxlLgorICAgIH0KICAgICB2ODo6TG9jYWw8djg6Ok9iamVj dD4gaW5zdGFuY2U7CiAgICAgaWYgKHByb3h5KQogICAgICAgICBpbnN0YW5jZSA9IHByb3h5LT5j cmVhdGVXcmFwcGVyRnJvbUNhY2hlKGRlc2NyaXB0b3JUeXBlKTsKICAgICBlbHNlIHsKLSAgICAg ICAgdjg6OkxvY2FsPHY4OjpGdW5jdGlvbj4gZnVuY3Rpb24gPSBWOERPTVdyYXBwZXI6OmdldFRl bXBsYXRlKGRlc2NyaXB0b3JUeXBlKS0+R2V0RnVuY3Rpb24oKTsKKyAgICAgICAgdjg6OkxvY2Fs PHY4OjpGdW5jdGlvbj4gZnVuY3Rpb24gPSBnZXRUZW1wbGF0ZShkZXNjcmlwdG9yVHlwZSktPkdl dEZ1bmN0aW9uKCk7CiAgICAgICAgIGluc3RhbmNlID0gU2FmZUFsbG9jYXRpb246Om5ld0luc3Rh bmNlKGZ1bmN0aW9uKTsKICAgICB9CiAgICAgaWYgKCFpbnN0YW5jZS5Jc0VtcHR5KCkpIHsKICAg ICAgICAgLy8gQXZvaWQgc2V0dGluZyB0aGUgRE9NIHdyYXBwZXIgZm9yIGZhaWxlZCBhbGxvY2F0 aW9ucy4KLSAgICAgICAgVjhET01XcmFwcGVyOjpzZXRET01XcmFwcGVyKGluc3RhbmNlLCBWOENs YXNzSW5kZXg6OlRvSW50KGNwdHJUeXBlKSwgaW1wbCk7CisgICAgICAgIHNldERPTVdyYXBwZXIo aW5zdGFuY2UsIFY4Q2xhc3NJbmRleDo6VG9JbnQoY3B0clR5cGUpLCBpbXBsKTsKICAgICB9CiAg ICAgcmV0dXJuIGluc3RhbmNlOwogfQpAQCAtMTEyOCwxOSArMTEyOCwxOSBAQCB2ODo6SGFuZGxl PHY4OjpWYWx1ZT4gVjhET01XcmFwcGVyOjpjb252ZXJ0Tm9kZVRvVjhPYmplY3QoTm9kZSogbm9k ZSkKICAgICAgICAgQVNTRVJUKHR5cGUgIT0gVjhDbGFzc0luZGV4OjpJTlZBTElEX0NMQVNTX0lO REVYKTsKICAgICB9CiAKLSAgICB2ODo6TG9jYWw8djg6OkNvbnRleHQ+IHY4Q29udGV4dDsKKyAg ICB2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0OwogICAgIGlmIChwcm94eSkKLSAgICAg ICAgdjhDb250ZXh0ID0gcHJveHktPmNvbnRleHQoKTsKKyAgICAgICAgY29udGV4dCA9IGdldFdy YXBwZXJDb250ZXh0KHByb3h5LT5mcmFtZSgpKTsKIAogICAgIC8vIEVudGVyIHRoZSBub2RlJ3Mg Y29udGV4dCBhbmQgY3JlYXRlIHRoZSB3cmFwcGVyIGluIHRoYXQgY29udGV4dC4KLSAgICBpZiAo IXY4Q29udGV4dC5Jc0VtcHR5KCkpCi0gICAgICAgIHY4Q29udGV4dC0+RW50ZXIoKTsKKyAgICBp ZiAoIWNvbnRleHQuSXNFbXB0eSgpKQorICAgICAgICBjb250ZXh0LT5FbnRlcigpOwogCiAgICAg djg6OkxvY2FsPHY4OjpPYmplY3Q+IHJlc3VsdCA9IGluc3RhbnRpYXRlVjhPYmplY3QocHJveHks IHR5cGUsIFY4Q2xhc3NJbmRleDo6Tk9ERSwgbm9kZSk7CiAKICAgICAvLyBFeGl0IHRoZSBub2Rl J3MgY29udGV4dCBpZiBpdCB3YXMgZW50ZXJlZC4KLSAgICBpZiAoIXY4Q29udGV4dC5Jc0VtcHR5 KCkpCi0gICAgICAgIHY4Q29udGV4dC0+RXhpdCgpOworICAgIGlmICghY29udGV4dC5Jc0VtcHR5 KCkpCisgICAgICAgIGNvbnRleHQtPkV4aXQoKTsKIAogICAgIGlmIChyZXN1bHQuSXNFbXB0eSgp KSB7CiAgICAgICAgIC8vIElmIGluc3RhbnRpYXRpb24gZmFpbGVkIGl0J3MgaW1wb3J0YW50IG5v dCB0byBhZGQgdGhlIHJlc3VsdApAQCAtMTM5MCwxMyArMTM5MCwyOCBAQCB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gVjhET01XcmFwcGVyOjpjb252ZXJ0V2luZG93VG9WOE9iamVjdChET01XaW5kb3cq IHdpbmRvdykKICAgICB9CiAKICAgICAvLyBPdGhlcndpc2UsIHJldHVybiB0aGUgZ2xvYmFsIG9i amVjdCBhc3NvY2lhdGVkIHdpdGggdGhpcyBmcmFtZS4KLSAgICB2ODo6SGFuZGxlPHY4OjpDb250 ZXh0PiB2OENvbnRleHQgPSBWOFByb3h5Ojpjb250ZXh0KGZyYW1lKTsKLSAgICBpZiAodjhDb250 ZXh0LklzRW1wdHkoKSkKKyAgICB2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0ID0gZ2V0 V3JhcHBlckNvbnRleHQoZnJhbWUpOworICAgIGlmIChjb250ZXh0LklzRW1wdHkoKSkKICAgICAg ICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4oKTsKIAotICAgIHY4OjpIYW5kbGU8djg6 Ok9iamVjdD4gZ2xvYmFsID0gdjhDb250ZXh0LT5HbG9iYWwoKTsKKyAgICB2ODo6SGFuZGxlPHY4 OjpPYmplY3Q+IGdsb2JhbCA9IGNvbnRleHQtPkdsb2JhbCgpOwogICAgIEFTU0VSVCghZ2xvYmFs LklzRW1wdHkoKSk7CiAgICAgcmV0dXJuIGdsb2JhbDsKIH0KIAordjg6OkhhbmRsZTx2ODo6Q29u dGV4dD4gVjhET01XcmFwcGVyOjpnZXRXcmFwcGVyQ29udGV4dChGcmFtZSogZnJhbWUpCit7Cisg ICAgdjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCA9IFY4UHJveHk6OmNvbnRleHQoZnJh bWUpOworICAgIGlmIChjb250ZXh0LklzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIHY4OjpIYW5k bGU8djg6OkNvbnRleHQ+KCk7CisKKyAgICBpZiAoVjhJc29sYXRlZFdvcmxkKiB3b3JsZCA9IFY4 SXNvbGF0ZWRXb3JsZDo6Z2V0RW50ZXJlZCgpKSB7CisgICAgICAgY29udGV4dCA9IHdvcmxkLT5j b250ZXh0KCk7CisgICAgICAgaWYgKGZyYW1lICE9IFY4UHJveHk6OnJldHJpZXZlRnJhbWUoY29u dGV4dCkpCisgICAgICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+KCk7CisgICAg fQorCisgICAgcmV0dXJuIGNvbnRleHQ7Cit9CisKIH0gIC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRp ZmYgLS1naXQgYS92OC9WOERPTVdyYXBwZXIuaCBiL3Y4L1Y4RE9NV3JhcHBlci5oCmluZGV4IGM3 MDg1OTEuLjY2ZjE5NDggMTAwNzU1Ci0tLSBhL3Y4L1Y4RE9NV3JhcHBlci5oCisrKyBiL3Y4L1Y4 RE9NV3JhcHBlci5oCkBAIC0yMzUsNiArMjM1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAg ICAgICAgIHN0YXRpYyB2ODo6TG9jYWw8djg6Ok9iamVjdD4gaW5zdGFudGlhdGVWOE9iamVjdChW OFByb3h5KiwgVjhDbGFzc0luZGV4OjpWOFdyYXBwZXJUeXBlLCBWOENsYXNzSW5kZXg6OlY4V3Jh cHBlclR5cGUsIHZvaWQqKTsKIAorICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6Q29udGV4 dD4gVjhET01XcmFwcGVyOjpnZXRXcmFwcGVyQ29udGV4dChGcmFtZSogZnJhbWUpOwogICAgIH07 CiAKIH0K