107249 2013-01-18 02:39:39 -0800 [V8] We should set a class id for a NPObject wrapper 2013-01-20 23:20:19 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 810410 0 haraken 2013-01-18 02:39:39 -0800 This is one of steps to avoid hitting an ASSERT() that will be added in https://bugs.webkit.org/show_bug.cgi?id=107137 . We should set a class id for all wrapper objects. 810414 1 183414 haraken 2013-01-18 02:46:40 -0800 Created attachment 183414 Patch 810853 2 183414 abarth 2013-01-18 11:09:02 -0800 Comment on attachment 183414 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183414&action=review What effect does setting the class ID have? I think it causes us to assume the object has native info, which is true of these objects. I think this change is probably ok, but I'll need to study it more. > Source/WebCore/bindings/v8/V8NPObject.cpp:434 > + // FIXME: Move staticNPObjectMap() to DOMDataStore. There's something weird about weakNPObjectCallback, which is why I didn't do this before. Our code might be good enough for us to do it now though. > Source/WebCore/bindings/v8/V8NPObject.cpp:446 > + v8::Persistent<v8::Object> wrapperHandle = v8::Persistent<v8::Object>::New(value); > + V8DOMWrapper::setWrapperClass(object, wrapperHandle); > + staticNPObjectMap().set(object, wrapperHandle); Is it ok that we've re-ordered this operations relative to _NPN_RetainObject and _NPN_RegisterObject ? 811580 3 183414 abarth 2013-01-20 01:00:28 -0800 Comment on attachment 183414 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183414&action=review > Source/WebCore/bindings/v8/V8NPObject.cpp:445 > + V8DOMWrapper::setWrapperClass(object, wrapperHandle); I've checked, and this should be fine. The main thin we use the wrapper class for is make sure that the object has native info set. The main thing I'm worried about in this patch is the re-ordering of these calls and the _NPN_RetainObject and _NPN_RegisterObject calls. Is that necessary? 811786 4 183709 haraken 2013-01-20 21:55:05 -0800 Created attachment 183709 Patch 811787 5 haraken 2013-01-20 21:55:40 -0800 (In reply to comment #3) > The main thing I'm worried about in this patch is the re-ordering of these calls and the _NPN_RetainObject and _NPN_RegisterObject calls. Is that necessary? Fixed the re-order issue. Thanks! 811793 6 183709 abarth 2013-01-20 22:04:36 -0800 Comment on attachment 183709 Patch Thanks. 811826 7 183709 webkit.review.bot 2013-01-20 22:51:01 -0800 Comment on attachment 183709 Patch Rejecting attachment 183709 from commit-queue. New failing tests: inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html Full output: http://queues.webkit.org/results/16010311 811847 8 183709 webkit.review.bot 2013-01-20 23:20:15 -0800 Comment on attachment 183709 Patch Clearing flags on attachment: 183709 Committed r140302: <http://trac.webkit.org/changeset/140302> 811848 9 webkit.review.bot 2013-01-20 23:20:19 -0800 All reviewed patches have been landed. Closing bug. 183414 2013-01-18 02:46:40 -0800 2013-01-20 21:55:02 -0800 Patch bug-107249-20130118114339.patch text/plain 4837 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWViYzhkYzY2NGU1ZGYw OTE2OWVkZGM0MTFhZGQzN2QxYjI3NGQzNS4uZmVkMGExYWM5ZDYzODA3N2RhMTUwNTNjODI0ODEx YmVlZTQzYzQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAxLTE4ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFdlIHNob3Vs ZCBzZXQgYSBjbGFzcyBpZCBmb3IgYSBOUE9iamVjdCB3cmFwcGVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDcyNDkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIG9uZSBvZiBzdGVwcyB0byBh dm9pZCBoaXR0aW5nIGFuIEFTU0VSVCgpCisgICAgICAgIHRoYXQgd2lsbCBiZSBhZGRlZCBpbiBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MTM3IC4KKworICAgICAg ICBFc3NlbnRpYWxseSwgdGhpcyBwYXRjaCBqdXN0IGFkZHMgc2V0V3JhcHBlckNsYXNzSWQoKSBm b3IKKyAgICAgICAgYSBOUE9iamVjdCB3cmFwcGVyLgorCisgICAgICAgIE5vIHRlc3RzLiBObyBj aGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTVdyYXBwZXIu aDoKKyAgICAgICAgKFY4RE9NV3JhcHBlcik6CisgICAgICAgIChXZWJDb3JlOjpWOERPTVdyYXBw ZXI6OnNldFdyYXBwZXJDbGFzcyk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBiaW5k aW5ncy92OC9WOE5QT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZVY4T2JqZWN0 Rm9yTlBPYmplY3QpOgorCiAyMDEzLTAxLTE4ICBWaXZlayBHYWxhdGFnZSAgPHZpdmVrLnZnQHNh bXN1bmcuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNlYXJjaCBzaG9ydGN1dCBjbGVh cnMgdGhlIGN1cnJlbnQgc2VhcmNoIGJveCBjb250ZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9WOERPTVdyYXBwZXIuaAppbmRleCA1YWVmNTVjYmM3ZjgwMDY1NGE1OGEyNWViYzU3YzNl MTNlM2M4NTQ0Li42NzE5NjdmNDBkZDU1Zjk2Y2QxMjczYjk2NDFiOTBhZmE3YjJjOWYwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuaApAQCAtNjQsNiArNjQsOCBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHN0YXRpYyBpbmxpbmUgdjg6OlBlcnNpc3Rl bnQ8djg6Ok9iamVjdD4gYXNzb2NpYXRlT2JqZWN0V2l0aFdyYXBwZXIoUGFzc1JlZlB0cjxUPiwg V3JhcHBlclR5cGVJbmZvKiwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Piwgdjg6Oklzb2xhdGUqKTsK ICAgICAgICAgc3RhdGljIGlubGluZSB2b2lkIHNldE5hdGl2ZUluZm8odjg6OkhhbmRsZTx2ODo6 T2JqZWN0PiwgV3JhcHBlclR5cGVJbmZvKiwgdm9pZCopOwogICAgICAgICBzdGF0aWMgaW5saW5l IHZvaWQgY2xlYXJOYXRpdmVJbmZvKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4sIFdyYXBwZXJUeXBl SW5mbyopOworICAgICAgICBzdGF0aWMgaW5saW5lIHZvaWQgc2V0V3JhcHBlckNsYXNzKHZvaWQq LCB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0Pik7CisgICAgICAgIHN0YXRpYyBpbmxpbmUgdm9p ZCBzZXRXcmFwcGVyQ2xhc3MoTm9kZSosIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+KTsKIAog ICAgICAgICAvLyBGSVhNRTogVGhpcyBmdW5jdGlvbiBzaG91bGQgcHJvYmFibHkgbW92ZSB0byBW OEV2ZW50TGlzdGVuZXJMaXN0LmgKICAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8RXZlbnRMaXN0 ZW5lcj4gZ2V0RXZlbnRMaXN0ZW5lcih2ODo6TG9jYWw8djg6OlZhbHVlPiwgYm9vbCBpc0F0dHJp YnV0ZSwgTGlzdGVuZXJMb29rdXBUeXBlKTsKQEAgLTcyLDEyICs3NCwxOCBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKICAgICAgICAgLy8gRklYTUU6IFdoeSBpcyB0aGlzIGZ1bmN0aW9uIGluIFY4 RE9NV3JhcHBlcj8KICAgICAgICAgc3RhdGljIHZvaWQgc2V0TmFtZWRIaWRkZW5SZWZlcmVuY2Uo djg6OkhhbmRsZTx2ODo6T2JqZWN0PiBwYXJlbnQsIGNvbnN0IGNoYXIqIG5hbWUsIHY4OjpIYW5k bGU8djg6OlZhbHVlPiBjaGlsZCk7Ci0KLSAgICBwcml2YXRlOgotICAgICAgICBzdGF0aWMgdm9p ZCBzZXRXcmFwcGVyQ2xhc3Modm9pZCosIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+IHdyYXBw ZXIpIHsgd3JhcHBlci5TZXRXcmFwcGVyQ2xhc3NJZCh2OERPTU9iamVjdENsYXNzSWQpOyB9Ci0g ICAgICAgIHN0YXRpYyB2b2lkIHNldFdyYXBwZXJDbGFzcyhOb2RlKiwgdjg6OlBlcnNpc3RlbnQ8 djg6Ok9iamVjdD4gd3JhcHBlcikgeyB3cmFwcGVyLlNldFdyYXBwZXJDbGFzc0lkKHY4RE9NTm9k ZUNsYXNzSWQpOyB9CiAgICAgfTsKIAorICAgIGlubGluZSB2b2lkIFY4RE9NV3JhcHBlcjo6c2V0 V3JhcHBlckNsYXNzKHZvaWQqLCB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0PiB3cmFwcGVyKQor ICAgIHsKKyAgICAgICAgd3JhcHBlci5TZXRXcmFwcGVyQ2xhc3NJZCh2OERPTU9iamVjdENsYXNz SWQpOworICAgIH0KKworICAgIGlubGluZSB2b2lkIFY4RE9NV3JhcHBlcjo6c2V0V3JhcHBlckNs YXNzKE5vZGUqLCB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0PiB3cmFwcGVyKQorICAgIHsKKyAg ICAgICAgd3JhcHBlci5TZXRXcmFwcGVyQ2xhc3NJZCh2OERPTU5vZGVDbGFzc0lkKTsKKyAgICB9 CisKICAgICBpbmxpbmUgdm9pZCBWOERPTVdyYXBwZXI6OnNldE5hdGl2ZUluZm8odjg6OkhhbmRs ZTx2ODo6T2JqZWN0PiB3cmFwcGVyLCBXcmFwcGVyVHlwZUluZm8qIHR5cGUsIHZvaWQqIG9iamVj dCkKICAgICB7CiAgICAgICAgIEFTU0VSVCh3cmFwcGVyLT5JbnRlcm5hbEZpZWxkQ291bnQoKSA+ PSAyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4TlBPYmplY3Qu Y3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhOUE9iamVjdC5jcHAKaW5kZXggNzcx ZTJjM2YxMWU0M2VmMTUxMmZlMjUyOGIzY2I4OWRmMDIyM2ZlYi4uOGFlZTk0MzE3NGE5NTdiNDI3 MjkyMzQ5NDRiMzI0Y2M0MWViOTQyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvVjhOUE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhO UE9iamVjdC5jcHAKQEAgLTQzMSwyNCArNDMxLDI0IEBAIHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBj cmVhdGVWOE9iamVjdEZvck5QT2JqZWN0KE5QT2JqZWN0KiBvYmplY3QsIE5QT2JqZWN0KiByb290 CiAgICAgICAgIG5wT2JqZWN0RGVzYy0+SW5zdGFuY2VUZW1wbGF0ZSgpLT5TZXRDYWxsQXNGdW5j dGlvbkhhbmRsZXIobnBPYmplY3RJbnZva2VEZWZhdWx0SGFuZGxlcik7CiAgICAgfQogCisgICAg Ly8gRklYTUU6IE1vdmUgc3RhdGljTlBPYmplY3RNYXAoKSB0byBET01EYXRhU3RvcmUuCisgICAg Ly8gVXNlIFY4RE9NV3JhcHBlcjo6Y3JlYXRlV3JhcHBlcigpIGFuZAorICAgIC8vIFY4RE9NV3Jh cHBlcjo6YXNzb2NpYXRlT2JqZWN0V2l0aFdyYXBwZXIoKQorICAgIC8vIHRvIGNyZWF0ZSBhIHdy YXBwZXIgb2JqZWN0LgogICAgIHY4OjpIYW5kbGU8djg6OkZ1bmN0aW9uPiB2OEZ1bmN0aW9uID0g bnBPYmplY3REZXNjLT5HZXRGdW5jdGlvbigpOwogICAgIHY4OjpMb2NhbDx2ODo6T2JqZWN0PiB2 YWx1ZSA9IFY4T2JqZWN0Q29uc3RydWN0b3I6Om5ld0luc3RhbmNlKHY4RnVuY3Rpb24pOwotCi0g ICAgLy8gSWYgd2Ugd2VyZSB1bmFibGUgdG8gYWxsb2NhdGUgdGhlIGluc3RhbmNlLCB3ZSBhdm9p ZCB3cmFwcGluZyBhbmQgcmVnaXN0ZXJpbmcgdGhlIE5QIG9iamVjdC4KICAgICBpZiAodmFsdWUu SXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gdmFsdWU7CiAKICAgICBWOERPTVdyYXBwZXI6OnNl dE5hdGl2ZUluZm8odmFsdWUsIG5wT2JqZWN0VHlwZUluZm8oKSwgb2JqZWN0KTsKKyAgICB2ODo6 UGVyc2lzdGVudDx2ODo6T2JqZWN0PiB3cmFwcGVySGFuZGxlID0gdjg6OlBlcnNpc3RlbnQ8djg6 Ok9iamVjdD46Ok5ldyh2YWx1ZSk7CisgICAgVjhET01XcmFwcGVyOjpzZXRXcmFwcGVyQ2xhc3Mo b2JqZWN0LCB3cmFwcGVySGFuZGxlKTsKKyAgICBzdGF0aWNOUE9iamVjdE1hcCgpLnNldChvYmpl Y3QsIHdyYXBwZXJIYW5kbGUpOworICAgIEFTU0VSVChtYXliZURPTVdyYXBwZXIod3JhcHBlckhh bmRsZSkpOwogCiAgICAgLy8gS0pTIHJldGFpbnMgdGhlIG9iamVjdCBhcyBwYXJ0IG9mIGl0cyB3 cmFwcGVyIChzZWUgQmluZGluZ3M6OkNJbnN0YW5jZSkuCiAgICAgX05QTl9SZXRhaW5PYmplY3Qo b2JqZWN0KTsKLQogICAgIF9OUE5fUmVnaXN0ZXJPYmplY3Qob2JqZWN0LCByb290KTsKLQotICAg IC8vIE1haW50YWluIGEgd2VhayBwb2ludGVyIGZvciB2OCBzbyB3ZSBjYW4gY2xlYW51cCB0aGUg b2JqZWN0LgotICAgIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+IHdlYWtSZWYgPSB2ODo6UGVy c2lzdGVudDx2ODo6T2JqZWN0Pjo6TmV3KHZhbHVlKTsKLSAgICBzdGF0aWNOUE9iamVjdE1hcCgp LnNldChvYmplY3QsIHdlYWtSZWYpOwotCiAgICAgcmV0dXJuIHZhbHVlOwogfQogCg== 183709 2013-01-20 21:55:05 -0800 2013-01-20 23:20:15 -0800 Patch bug-107249-20130121145201.patch text/plain 4805 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMjg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOThkMTFlYWRkMGUzNTFk OGRhMTU5ZDQxYmU0ZmM3YmJmYTI3NTNiOS4uYzBmMGZmMDE2NDdlYmFlZjJjYjlmZDM3YTlhYmZj NWY4NTI4ZmI4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEzLTAxLTIwICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBbVjhdIFdlIHNob3Vs ZCBzZXQgYSBjbGFzcyBpZCBmb3IgYSBOUE9iamVjdCB3cmFwcGVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDcyNDkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIG9uZSBvZiBzdGVwcyB0byBh dm9pZCBoaXR0aW5nIGFuIEFTU0VSVCgpCisgICAgICAgIHRoYXQgd2lsbCBiZSBhZGRlZCBpbiBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MTM3IC4KKworICAgICAg ICBObyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogYmluZGluZ3Mv djgvVjhET01XcmFwcGVyLmg6CisgICAgICAgIChWOERPTVdyYXBwZXIpOgorICAgICAgICAoV2Vi Q29yZTo6VjhET01XcmFwcGVyOjpzZXRXcmFwcGVyQ2xhc3MpOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgICogYmluZGluZ3MvdjgvVjhOUE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpjcmVhdGVWOE9iamVjdEZvck5QT2JqZWN0KToKKworMjAxMy0wMS0yMCAgS2VudGFybyBIYXJh ICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBv dXQgcjE0MDI3MC4KICAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTQw MjcwCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDcy NTMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5o IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmgKaW5kZXggNWFlZjU1 Y2JjN2Y4MDA2NTRhNThhMjVlYmM1N2MzZTEzZTNjODU0NC4uNjcxOTY3ZjQwZGQ1NWY5NmNkMTI3 M2I5NjQxYjkwYWZhN2IyYzlmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvVjhET01XcmFwcGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01X cmFwcGVyLmgKQEAgLTY0LDYgKzY0LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBz dGF0aWMgaW5saW5lIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+IGFzc29jaWF0ZU9iamVjdFdp dGhXcmFwcGVyKFBhc3NSZWZQdHI8VD4sIFdyYXBwZXJUeXBlSW5mbyosIHY4OjpIYW5kbGU8djg6 Ok9iamVjdD4sIHY4OjpJc29sYXRlKik7CiAgICAgICAgIHN0YXRpYyBpbmxpbmUgdm9pZCBzZXRO YXRpdmVJbmZvKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4sIFdyYXBwZXJUeXBlSW5mbyosIHZvaWQq KTsKICAgICAgICAgc3RhdGljIGlubGluZSB2b2lkIGNsZWFyTmF0aXZlSW5mbyh2ODo6SGFuZGxl PHY4OjpPYmplY3Q+LCBXcmFwcGVyVHlwZUluZm8qKTsKKyAgICAgICAgc3RhdGljIGlubGluZSB2 b2lkIHNldFdyYXBwZXJDbGFzcyh2b2lkKiwgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD4pOwor ICAgICAgICBzdGF0aWMgaW5saW5lIHZvaWQgc2V0V3JhcHBlckNsYXNzKE5vZGUqLCB2ODo6UGVy c2lzdGVudDx2ODo6T2JqZWN0Pik7CiAKICAgICAgICAgLy8gRklYTUU6IFRoaXMgZnVuY3Rpb24g c2hvdWxkIHByb2JhYmx5IG1vdmUgdG8gVjhFdmVudExpc3RlbmVyTGlzdC5oCiAgICAgICAgIHN0 YXRpYyBQYXNzUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGdldEV2ZW50TGlzdGVuZXIodjg6OkxvY2Fs PHY4OjpWYWx1ZT4sIGJvb2wgaXNBdHRyaWJ1dGUsIExpc3RlbmVyTG9va3VwVHlwZSk7CkBAIC03 MiwxMiArNzQsMTggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIC8vIEZJWE1FOiBX aHkgaXMgdGhpcyBmdW5jdGlvbiBpbiBWOERPTVdyYXBwZXI/CiAgICAgICAgIHN0YXRpYyB2b2lk IHNldE5hbWVkSGlkZGVuUmVmZXJlbmNlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gcGFyZW50LCBj b25zdCBjaGFyKiBuYW1lLCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gY2hpbGQpOwotCi0gICAgcHJp dmF0ZToKLSAgICAgICAgc3RhdGljIHZvaWQgc2V0V3JhcHBlckNsYXNzKHZvaWQqLCB2ODo6UGVy c2lzdGVudDx2ODo6T2JqZWN0PiB3cmFwcGVyKSB7IHdyYXBwZXIuU2V0V3JhcHBlckNsYXNzSWQo djhET01PYmplY3RDbGFzc0lkKTsgfQotICAgICAgICBzdGF0aWMgdm9pZCBzZXRXcmFwcGVyQ2xh c3MoTm9kZSosIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+IHdyYXBwZXIpIHsgd3JhcHBlci5T ZXRXcmFwcGVyQ2xhc3NJZCh2OERPTU5vZGVDbGFzc0lkKTsgfQogICAgIH07CiAKKyAgICBpbmxp bmUgdm9pZCBWOERPTVdyYXBwZXI6OnNldFdyYXBwZXJDbGFzcyh2b2lkKiwgdjg6OlBlcnNpc3Rl bnQ8djg6Ok9iamVjdD4gd3JhcHBlcikKKyAgICB7CisgICAgICAgIHdyYXBwZXIuU2V0V3JhcHBl ckNsYXNzSWQodjhET01PYmplY3RDbGFzc0lkKTsKKyAgICB9CisKKyAgICBpbmxpbmUgdm9pZCBW OERPTVdyYXBwZXI6OnNldFdyYXBwZXJDbGFzcyhOb2RlKiwgdjg6OlBlcnNpc3RlbnQ8djg6Ok9i amVjdD4gd3JhcHBlcikKKyAgICB7CisgICAgICAgIHdyYXBwZXIuU2V0V3JhcHBlckNsYXNzSWQo djhET01Ob2RlQ2xhc3NJZCk7CisgICAgfQorCiAgICAgaW5saW5lIHZvaWQgVjhET01XcmFwcGVy OjpzZXROYXRpdmVJbmZvKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd3JhcHBlciwgV3JhcHBlclR5 cGVJbmZvKiB0eXBlLCB2b2lkKiBvYmplY3QpCiAgICAgewogICAgICAgICBBU1NFUlQod3JhcHBl ci0+SW50ZXJuYWxGaWVsZENvdW50KCkgPj0gMik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9WOE5QT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4TlBPYmplY3QuY3BwCmluZGV4IDc3MWUyYzNmMTFlNDNlZjE1MTJmZTI1MjhiM2NiODlkZjAy MjNmZWIuLjhmZWRhZTg1NzQ3OGUzNWQ4ZWEyYWYzZGIwYWI3ZTZjMTQxMDdmZTMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4TlBPYmplY3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4TlBPYmplY3QuY3BwCkBAIC00MzEsMjQgKzQzMSwyNSBA QCB2ODo6TG9jYWw8djg6Ok9iamVjdD4gY3JlYXRlVjhPYmplY3RGb3JOUE9iamVjdChOUE9iamVj dCogb2JqZWN0LCBOUE9iamVjdCogcm9vdAogICAgICAgICBucE9iamVjdERlc2MtPkluc3RhbmNl VGVtcGxhdGUoKS0+U2V0Q2FsbEFzRnVuY3Rpb25IYW5kbGVyKG5wT2JqZWN0SW52b2tlRGVmYXVs dEhhbmRsZXIpOwogICAgIH0KIAorICAgIC8vIEZJWE1FOiBNb3ZlIHN0YXRpY05QT2JqZWN0TWFw KCkgdG8gRE9NRGF0YVN0b3JlLgorICAgIC8vIFVzZSBWOERPTVdyYXBwZXI6OmNyZWF0ZVdyYXBw ZXIoKSBhbmQKKyAgICAvLyBWOERPTVdyYXBwZXI6OmFzc29jaWF0ZU9iamVjdFdpdGhXcmFwcGVy KCkKKyAgICAvLyB0byBjcmVhdGUgYSB3cmFwcGVyIG9iamVjdC4KICAgICB2ODo6SGFuZGxlPHY4 OjpGdW5jdGlvbj4gdjhGdW5jdGlvbiA9IG5wT2JqZWN0RGVzYy0+R2V0RnVuY3Rpb24oKTsKICAg ICB2ODo6TG9jYWw8djg6Ok9iamVjdD4gdmFsdWUgPSBWOE9iamVjdENvbnN0cnVjdG9yOjpuZXdJ bnN0YW5jZSh2OEZ1bmN0aW9uKTsKLQotICAgIC8vIElmIHdlIHdlcmUgdW5hYmxlIHRvIGFsbG9j YXRlIHRoZSBpbnN0YW5jZSwgd2UgYXZvaWQgd3JhcHBpbmcgYW5kIHJlZ2lzdGVyaW5nIHRoZSBO UCBvYmplY3QuCiAgICAgaWYgKHZhbHVlLklzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHZhbHVl OwogCiAgICAgVjhET01XcmFwcGVyOjpzZXROYXRpdmVJbmZvKHZhbHVlLCBucE9iamVjdFR5cGVJ bmZvKCksIG9iamVjdCk7CisgICAgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD4gd3JhcHBlckhh bmRsZSA9IHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+OjpOZXcodmFsdWUpOworICAgIFY4RE9N V3JhcHBlcjo6c2V0V3JhcHBlckNsYXNzKG9iamVjdCwgd3JhcHBlckhhbmRsZSk7CiAKICAgICAv LyBLSlMgcmV0YWlucyB0aGUgb2JqZWN0IGFzIHBhcnQgb2YgaXRzIHdyYXBwZXIgKHNlZSBCaW5k aW5nczo6Q0luc3RhbmNlKS4KICAgICBfTlBOX1JldGFpbk9iamVjdChvYmplY3QpOwotCiAgICAg X05QTl9SZWdpc3Rlck9iamVjdChvYmplY3QsIHJvb3QpOwogCi0gICAgLy8gTWFpbnRhaW4gYSB3 ZWFrIHBvaW50ZXIgZm9yIHY4IHNvIHdlIGNhbiBjbGVhbnVwIHRoZSBvYmplY3QuCi0gICAgdjg6 OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD4gd2Vha1JlZiA9IHY4OjpQZXJzaXN0ZW50PHY4OjpPYmpl Y3Q+OjpOZXcodmFsdWUpOwotICAgIHN0YXRpY05QT2JqZWN0TWFwKCkuc2V0KG9iamVjdCwgd2Vh a1JlZik7Ci0KKyAgICBzdGF0aWNOUE9iamVjdE1hcCgpLnNldChvYmplY3QsIHdyYXBwZXJIYW5k bGUpOworICAgIEFTU0VSVChtYXliZURPTVdyYXBwZXIod3JhcHBlckhhbmRsZSkpOwogICAgIHJl dHVybiB2YWx1ZTsKIH0KIAo=