106916 2013-01-15 09:34:33 -0800 [V8] Make an Isolate parameter mandatory in SerializedScriptValue::deserialize() 2013-01-16 02:03:44 -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 807381 0 haraken 2013-01-15 09:34:33 -0800 This is one of steps to remove optional Isolate parameters. 807383 1 182792 haraken 2013-01-15 09:36:43 -0800 Created attachment 182792 Patch 807572 2 182792 abarth 2013-01-15 12:35:33 -0800 Comment on attachment 182792 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182792&action=review > Source/WebCore/bindings/v8/SerializedScriptValue.h:88 > + ScriptValue deserializeForInspector(ScriptState*); > + ScriptValue deserializeForInspector(ScriptState*, v8::Isolate*); We should put the Isolate into ScriptState instead of passing them separately. Everyone who takes a ScriptState is going to need an isolate. 808104 3 182925 haraken 2013-01-16 00:17:29 -0800 Created attachment 182925 patch for landing 808105 4 haraken 2013-01-16 00:18:08 -0800 (In reply to comment #2) > We should put the Isolate into ScriptState instead of passing them separately. Everyone who takes a ScriptState is going to need an isolate. Done. Thanks! 808121 5 haraken 2013-01-16 00:45:58 -0800 We might want to implement v8::Context::GetIsolate(). At entry points from WebCore, we have a Frame or a ScriptExecutionContext, which can be converted to a v8::Context. So once v8::Context::GetIsolate() is exposed, we can get an Isolate without calling v8::Isolate::GetCurrent(). I'm implementing v8::Context::GetIsolate(). 808179 6 haraken 2013-01-16 01:56:38 -0800 (In reply to comment #5) > I'm implementing v8::Context::GetIsolate(). The V8 patch is here: https://chromiumcodereview.appspot.com/11968011/ 808181 7 182925 webkit.review.bot 2013-01-16 02:03:38 -0800 Comment on attachment 182925 patch for landing Clearing flags on attachment: 182925 Committed r139854: <http://trac.webkit.org/changeset/139854> 808182 8 webkit.review.bot 2013-01-16 02:03:44 -0800 All reviewed patches have been landed. Closing bug. 182792 2013-01-15 09:36:43 -0800 2013-01-16 00:17:26 -0800 Patch bug-106916-20130115183342.patch text/plain 6644 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTU0YWI2NGE3MWQxNTNm MGVjZWU3MjQzMTQxYjA4YzBiOWViOTFjYS4uOGQ2OTY3OTgyNDU1MjRmM2I5YjI2MGE1NTNmZTgz N2YxZmY0ZTVmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAxLTE1ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIE1ha2UgYW4g SXNvbGF0ZSBwYXJhbWV0ZXIgbWFuZGF0b3J5IGluIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6ZGVz ZXJpYWxpemUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA2OTE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyBpcyBvbmUgb2Ygc3RlcHMgdG8gcmVtb3ZlIG9wdGlvbmFsIElzb2xhdGUgcGFyYW1l dGVycy4KKworICAgICAgICBObyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAg ICAgICogYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6ZGVzZXJpYWxpemUpOgorICAgICAgICAoV2Vi Q29yZSk6CisgICAgICAgIChXZWJDb3JlOjpTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmRlc2VyaWFs aXplRm9ySW5zcGVjdG9yKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TZXJpYWxpemVkU2NyaXB0 VmFsdWUuaDoKKyAgICAgICAgKFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSk6CisgICAgICAgICogYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4SGlzdG9yeUN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpW OEhpc3Rvcnk6OnN0YXRlQWNjZXNzb3JHZXR0ZXIpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1 c3RvbS9WOE1lc3NhZ2VFdmVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOE1lc3Nh Z2VFdmVudDo6ZGF0YUFjY2Vzc29yR2V0dGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0 b20vVjhQb3BTdGF0ZUV2ZW50Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4UG9wU3Rh dGVFdmVudDo6c3RhdGVBY2Nlc3NvckdldHRlcik6CisKIDIwMTMtMDEtMTQgIEtlbnRhcm8gSGFy YSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtWOF0gTWFrZSBhbiBJc29sYXRl IHBhcmFtZXRlciBtYW5kYXRvcnkgaW4gU2VyaWFsaXplZFNjcmlwdFZhbHVlIG1ldGhvZHMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1 ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUu Y3BwCmluZGV4IGU1MTU5ZGU0ZTZlZjFjYmVjM2RjYmM5MzVjZDk2NzY5OTQ0OTAyMTkuLjQ2YWJi ZDk3ZThhMTdhNWI0YjM5OWM0OTViNTBlNGE5YjQ5MjIxMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcApAQCAtMjQ2OCw3 ICsyNDY4LDEyIEBAIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVl KGNvbnN0IFN0cmluZyYgd2lyZURhdGEpCiAgICAgbV9kYXRhID0gd2lyZURhdGEuaXNvbGF0ZWRD b3B5KCk7CiB9CiAKLXY4OjpIYW5kbGU8djg6OlZhbHVlPiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6 OmRlc2VyaWFsaXplKE1lc3NhZ2VQb3J0QXJyYXkqIG1lc3NhZ2VQb3J0cywgdjg6Oklzb2xhdGUq IGlzb2xhdGUpCit2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpk ZXNlcmlhbGl6ZShNZXNzYWdlUG9ydEFycmF5KiBtZXNzYWdlUG9ydHMpCit7CisgICAgcmV0dXJu IGRlc2VyaWFsaXplKHY4OjpJc29sYXRlOjpHZXRDdXJyZW50KCksIG1lc3NhZ2VQb3J0cyk7Cit9 CisKK3Y4OjpIYW5kbGU8djg6OlZhbHVlPiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmRlc2VyaWFs aXplKHY4OjpJc29sYXRlKiBpc29sYXRlLCBNZXNzYWdlUG9ydEFycmF5KiBtZXNzYWdlUG9ydHMp CiB7CiAgICAgaWYgKCFtX2RhdGEuaW1wbCgpKQogICAgICAgICByZXR1cm4gdjhOdWxsV2l0aENo ZWNrKGlzb2xhdGUpOwpAQCAtMjQ3OSwxMiArMjQ4NCwxNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpkZXNlcmlhbGl6ZShNZXNzYWdlUG9ydEFycmF5KiBt ZXNzYQogfQogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKK1NjcmlwdFZhbHVlIFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZTo6ZGVzZXJpYWxpemVGb3JJbnNwZWN0b3IoU2NyaXB0U3RhdGUqIHNjcmlwdFN0 YXRlKQoreworICAgIHJldHVybiBkZXNlcmlhbGl6ZUZvckluc3BlY3RvcihzY3JpcHRTdGF0ZSwg djg6Oklzb2xhdGU6OkdldEN1cnJlbnQoKSk7Cit9CisKIFNjcmlwdFZhbHVlIFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZTo6ZGVzZXJpYWxpemVGb3JJbnNwZWN0b3IoU2NyaXB0U3RhdGUqIHNjcmlwdFN0 YXRlLCB2ODo6SXNvbGF0ZSogaXNvbGF0ZSkKIHsKICAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxl U2NvcGU7CiAgICAgdjg6OkNvbnRleHQ6OlNjb3BlIGNvbnRleHRTY29wZShzY3JpcHRTdGF0ZS0+ Y29udGV4dCgpKTsKIAotICAgIHJldHVybiBTY3JpcHRWYWx1ZShkZXNlcmlhbGl6ZSgwLCBpc29s YXRlKSk7CisgICAgcmV0dXJuIFNjcmlwdFZhbHVlKGRlc2VyaWFsaXplKGlzb2xhdGUpKTsKIH0K ICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TZXJpYWxp emVkU2NyaXB0VmFsdWUuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRT Y3JpcHRWYWx1ZS5oCmluZGV4IGEyMTk1OTViZTc1ODYwN2M0OGM5MjVjYTBiMTczOTE2ZDgwOTcz ODUuLjU0YzRiYWI2ZTQ2YjY5MzM1YmZlMWNhMDU2OTIzYWMxYjNhOTg4NjYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oCkBAIC04 MCwxMCArODAsMTIgQEAgcHVibGljOgogCiAgICAgLy8gRGVzZXJpYWxpemVzIHRoZSB2YWx1ZSAo aW4gdGhlIGN1cnJlbnQgY29udGV4dCkuIFJldHVybnMgYSBudWxsIHZhbHVlIGluCiAgICAgLy8g Y2FzZSBvZiBmYWlsdXJlLgotICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBkZXNlcmlhbGl6ZShN ZXNzYWdlUG9ydEFycmF5KiA9IDAsIHY4OjpJc29sYXRlKiA9IDApOworICAgIHY4OjpIYW5kbGU8 djg6OlZhbHVlPiBkZXNlcmlhbGl6ZShNZXNzYWdlUG9ydEFycmF5KiA9IDApOworICAgIHY4OjpI YW5kbGU8djg6OlZhbHVlPiBkZXNlcmlhbGl6ZSh2ODo6SXNvbGF0ZSosIE1lc3NhZ2VQb3J0QXJy YXkqID0gMCk7CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIFNjcmlwdFZhbHVlIGRlc2Vy aWFsaXplRm9ySW5zcGVjdG9yKFNjcmlwdFN0YXRlKiwgdjg6Oklzb2xhdGUqID0gMCk7CisgICAg U2NyaXB0VmFsdWUgZGVzZXJpYWxpemVGb3JJbnNwZWN0b3IoU2NyaXB0U3RhdGUqKTsKKyAgICBT Y3JpcHRWYWx1ZSBkZXNlcmlhbGl6ZUZvckluc3BlY3RvcihTY3JpcHRTdGF0ZSosIHY4OjpJc29s YXRlKik7CiAjZW5kaWYKIAogICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBibG9iVVJMcygpIGNv bnN0IHsgcmV0dXJuIG1fYmxvYlVSTHM7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L2N1c3RvbS9WOEhpc3RvcnlDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4SGlzdG9yeUN1c3RvbS5jcHAKaW5kZXggZjQ2M2MyM2ExMTZmMmI5 ZDNjOTU4OGRiNWVkMTExNmVhODg0OWMyYi4uMDFlY2RmMGNjZmU5YmU5ZGQ3YWFiNGJjYzMyZWQz NDQyYmNhNjAzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4SGlzdG9yeUN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4SGlzdG9yeUN1c3RvbS5jcHAKQEAgLTUxLDcgKzUxLDcgQEAgdjg6OkhhbmRsZTx2ODo6 VmFsdWU+IFY4SGlzdG9yeTo6c3RhdGVBY2Nlc3NvckdldHRlcih2ODo6TG9jYWw8djg6OlN0cmlu Zz4gbmFtZSwKICAgICAgICAgcmV0dXJuIHZhbHVlOwogCiAgICAgU2VyaWFsaXplZFNjcmlwdFZh bHVlKiBzZXJpYWxpemVkID0gaGlzdG9yeS0+c3RhdGUoKTsKLSAgICB2YWx1ZSA9IHNlcmlhbGl6 ZWQgPyBzZXJpYWxpemVkLT5kZXNlcmlhbGl6ZSgwLCBpbmZvLkdldElzb2xhdGUoKSkgOiB2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4odjhOdWxsKGluZm8uR2V0SXNvbGF0ZSgpKSk7CisgICAgdmFsdWUg PSBzZXJpYWxpemVkID8gc2VyaWFsaXplZC0+ZGVzZXJpYWxpemUoaW5mby5HZXRJc29sYXRlKCkp IDogdjg6OkhhbmRsZTx2ODo6VmFsdWU+KHY4TnVsbChpbmZvLkdldElzb2xhdGUoKSkpOwogICAg IGluZm8uSG9sZGVyKCktPlNldEhpZGRlblZhbHVlKFY4SGlkZGVuUHJvcGVydHlOYW1lOjpzdGF0 ZSgpLCB2YWx1ZSk7CiAKICAgICByZXR1cm4gdmFsdWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlRXZlbnRDdXN0b20uY3BwIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TWVzc2FnZUV2ZW50Q3VzdG9tLmNwcAppbmRl eCAzZDJjOTYyNDlmZjczZWU1MDJhMDg0YjdmNGIxNDUzZTIzNjFlMDFmLi5kYTViMWZkNzUwZTI4 NDZkZDAxZjBkM2I5ZWNhNDYyMzc2YzQwMDNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlRXZlbnRDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VFdmVudEN1c3RvbS5jcHAKQEAgLTU5 LDcgKzU5LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4TWVzc2FnZUV2ZW50OjpkYXRhQWNj ZXNzb3JHZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG4KIAogICAgIGNhc2UgTWVzc2FnZUV2 ZW50OjpEYXRhVHlwZVNlcmlhbGl6ZWRTY3JpcHRWYWx1ZToKICAgICAgICAgaWYgKFNlcmlhbGl6 ZWRTY3JpcHRWYWx1ZSogc2VyaWFsaXplZFZhbHVlID0gZXZlbnQtPmRhdGFBc1NlcmlhbGl6ZWRT Y3JpcHRWYWx1ZSgpKQotICAgICAgICAgICAgcmVzdWx0ID0gc2VyaWFsaXplZFZhbHVlLT5kZXNl cmlhbGl6ZShldmVudC0+cG9ydHMoKSwgaW5mby5HZXRJc29sYXRlKCkpOworICAgICAgICAgICAg cmVzdWx0ID0gc2VyaWFsaXplZFZhbHVlLT5kZXNlcmlhbGl6ZShpbmZvLkdldElzb2xhdGUoKSwg ZXZlbnQtPnBvcnRzKCkpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICByZXN1bHQgPSB2OE51 bGwoaW5mby5HZXRJc29sYXRlKCkpOwogICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFBvcFN0YXRlRXZlbnRDdXN0b20uY3BwIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4UG9wU3RhdGVFdmVudEN1c3RvbS5j cHAKaW5kZXggZjUzYzFmZWQ1ZDQ0ZGY4NDdmNTBiMDg3ODRhMjUyNGE4M2Y1ZTg1OC4uYWExYTY4 ZTdlYzE3OTk5ZTllMzViNDQ0ZTMzMTkyZWM2NGVlOWIzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4UG9wU3RhdGVFdmVudEN1c3RvbS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4UG9wU3RhdGVFdmVudEN1c3RvbS5j cHAKQEAgLTc2LDEwICs3NiwxMCBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhQb3BTdGF0ZUV2 ZW50OjpzdGF0ZUFjY2Vzc29yR2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPgogICAgICAgICAg ICAgaWYgKCFyZXN1bHQuSXNFbXB0eSgpKQogICAgICAgICAgICAgICAgIHJldHVybiBjYWNoZVN0 YXRlKGluZm8uSG9sZGVyKCksIHJlc3VsdCk7CiAgICAgICAgIH0KLSAgICAgICAgcmVzdWx0ID0g ZXZlbnQtPnNlcmlhbGl6ZWRTdGF0ZSgpLT5kZXNlcmlhbGl6ZSgwLCBpbmZvLkdldElzb2xhdGUo KSk7CisgICAgICAgIHJlc3VsdCA9IGV2ZW50LT5zZXJpYWxpemVkU3RhdGUoKS0+ZGVzZXJpYWxp emUoaW5mby5HZXRJc29sYXRlKCkpOwogICAgICAgICB2OEhpc3RvcnktPlNldEhpZGRlblZhbHVl KFY4SGlkZGVuUHJvcGVydHlOYW1lOjpzdGF0ZSgpLCByZXN1bHQpOwogICAgIH0gZWxzZQotICAg ICAgICByZXN1bHQgPSBldmVudC0+c2VyaWFsaXplZFN0YXRlKCktPmRlc2VyaWFsaXplKDAsIGlu Zm8uR2V0SXNvbGF0ZSgpKTsKKyAgICAgICAgcmVzdWx0ID0gZXZlbnQtPnNlcmlhbGl6ZWRTdGF0 ZSgpLT5kZXNlcmlhbGl6ZShpbmZvLkdldElzb2xhdGUoKSk7CiAKICAgICByZXR1cm4gY2FjaGVT dGF0ZShpbmZvLkhvbGRlcigpLCByZXN1bHQpOwogfQo= 182925 2013-01-16 00:17:29 -0800 2013-01-16 02:03:38 -0800 patch for landing bug-106916-20130116091431.patch text/plain 7327 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTU0YWI2NGE3MWQxNTNm MGVjZWU3MjQzMTQxYjA4YzBiOWViOTFjYS4uZjM0YWY1OWVkYTdjMjY0YWQwODc4ZWZmYmUxNDA0 MWFlZDk3OGY0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAxLTE1ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIE1ha2UgYW4g SXNvbGF0ZSBwYXJhbWV0ZXIgbWFuZGF0b3J5IGluIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6ZGVz ZXJpYWxpemUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA2OTE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBU aGlzIGlzIG9uZSBvZiBzdGVwcyB0byByZW1vdmUgb3B0aW9uYWwgSXNvbGF0ZSBwYXJhbWV0ZXJz LgorCisgICAgICAgIE5vIHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAg KiBiaW5kaW5ncy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlOjpkZXNlcmlhbGl6ZSk6CisgICAgICAgIChXZWJDb3Jl KToKKyAgICAgICAgKFdlYkNvcmU6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6ZGVzZXJpYWxpemVG b3JJbnNwZWN0b3IpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1 ZS5oOgorICAgICAgICAoU2VyaWFsaXplZFNjcmlwdFZhbHVlKToKKyAgICAgICAgKiBiaW5kaW5n cy92OC9jdXN0b20vVjhIaXN0b3J5Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4SGlz dG9yeTo6c3RhdGVBY2Nlc3NvckdldHRlcik6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9t L1Y4TWVzc2FnZUV2ZW50Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4TWVzc2FnZUV2 ZW50OjpkYXRhQWNjZXNzb3JHZXR0ZXIpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9W OFBvcFN0YXRlRXZlbnRDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhQb3BTdGF0ZUV2 ZW50OjpzdGF0ZUFjY2Vzc29yR2V0dGVyKToKKwogMjAxMy0wMS0xNCAgS2VudGFybyBIYXJhICA8 aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBNYWtlIGFuIElzb2xhdGUgcGFy YW1ldGVyIG1hbmRhdG9yeSBpbiBTZXJpYWxpemVkU2NyaXB0VmFsdWUgbWV0aG9kcwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U3RhdGUuaCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmgKaW5kZXggOWRiZjU1YTgyNGNjMjNjMDRi YjZmNjk3MGZmOGM0Mzg1Y2QxNzk4Yi4uYmEzMjVmYTM2NGU0ZjQzZjI1NDY0NjU4NmRlMTY3Zjk0 NGRiZGRlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U3Rh dGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTdGF0ZS5oCkBAIC02 Myw2ICs2MywxMyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiB2ODo6TG9jYWw8djg6OkNvbnRl eHQ+OjpOZXcobV9jb250ZXh0LmdldCgpKTsKICAgICB9CiAKKyAgICB2ODo6SXNvbGF0ZSogaXNv bGF0ZSgpCisgICAgeworICAgICAgICBpZiAoIW1faXNvbGF0ZSkKKyAgICAgICAgICAgIG1faXNv bGF0ZSA9IHY4OjpJc29sYXRlOjpHZXRDdXJyZW50KCk7CisgICAgICAgIHJldHVybiBtX2lzb2xh dGU7CisgICAgfQorCiAgICAgRE9NV2luZG93KiBkb21XaW5kb3coKSBjb25zdDsKICAgICBTY3Jp cHRFeGVjdXRpb25Db250ZXh0KiBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkgY29uc3Q7CiAKQEAg LTgxLDYgKzg4LDcgQEAgcHJpdmF0ZToKIAogICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IG1fZXhj ZXB0aW9uOwogICAgIFNjb3BlZFBlcnNpc3RlbnQ8djg6OkNvbnRleHQ+IG1fY29udGV4dDsKKyAg ICB2ODo6SXNvbGF0ZSogbV9pc29sYXRlOwogfTsKIAogY2xhc3MgRW1wdHlTY3JpcHRTdGF0ZSA6 IHB1YmxpYyBTY3JpcHRTdGF0ZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcAppbmRleCBlNTE1OWRlNGU2ZWYxY2JlYzNkY2Jj OTM1Y2Q5Njc2OTk0NDkwMjE5Li5iZTU0ZGYwNjViYWRmNDg1Y2ZlNTJlOWFkNzdlNWM1NzA5NWE0 MmE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TZXJpYWxpemVkU2Ny aXB0VmFsdWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRT Y3JpcHRWYWx1ZS5jcHAKQEAgLTI0NjgsNyArMjQ2OCwxMiBAQCBTZXJpYWxpemVkU2NyaXB0VmFs dWU6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZShjb25zdCBTdHJpbmcmIHdpcmVEYXRhKQogICAgIG1f ZGF0YSA9IHdpcmVEYXRhLmlzb2xhdGVkQ29weSgpOwogfQogCi12ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpkZXNlcmlhbGl6ZShNZXNzYWdlUG9ydEFycmF5KiBt ZXNzYWdlUG9ydHMsIHY4OjpJc29sYXRlKiBpc29sYXRlKQordjg6OkhhbmRsZTx2ODo6VmFsdWU+ IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6ZGVzZXJpYWxpemUoTWVzc2FnZVBvcnRBcnJheSogbWVz c2FnZVBvcnRzKQoreworICAgIHJldHVybiBkZXNlcmlhbGl6ZSh2ODo6SXNvbGF0ZTo6R2V0Q3Vy cmVudCgpLCBtZXNzYWdlUG9ydHMpOworfQorCit2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gU2VyaWFs aXplZFNjcmlwdFZhbHVlOjpkZXNlcmlhbGl6ZSh2ODo6SXNvbGF0ZSogaXNvbGF0ZSwgTWVzc2Fn ZVBvcnRBcnJheSogbWVzc2FnZVBvcnRzKQogewogICAgIGlmICghbV9kYXRhLmltcGwoKSkKICAg ICAgICAgcmV0dXJuIHY4TnVsbFdpdGhDaGVjayhpc29sYXRlKTsKQEAgLTI0NzksMTIgKzI0ODQs MTIgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6ZGVzZXJp YWxpemUoTWVzc2FnZVBvcnRBcnJheSogbWVzc2EKIH0KIAogI2lmIEVOQUJMRShJTlNQRUNUT1Ip Ci1TY3JpcHRWYWx1ZSBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmRlc2VyaWFsaXplRm9ySW5zcGVj dG9yKFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCitTY3Jp cHRWYWx1ZSBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmRlc2VyaWFsaXplRm9ySW5zcGVjdG9yKFNj cmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSkKIHsKICAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2Nv cGU7CiAgICAgdjg6OkNvbnRleHQ6OlNjb3BlIGNvbnRleHRTY29wZShzY3JpcHRTdGF0ZS0+Y29u dGV4dCgpKTsKIAotICAgIHJldHVybiBTY3JpcHRWYWx1ZShkZXNlcmlhbGl6ZSgwLCBpc29sYXRl KSk7CisgICAgcmV0dXJuIFNjcmlwdFZhbHVlKGRlc2VyaWFsaXplKHNjcmlwdFN0YXRlLT5pc29s YXRlKCkpKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oCmluZGV4IGEyMTk1OTViZTc1ODYwN2M0OGM5MjVjYTBi MTczOTE2ZDgwOTczODUuLjNiOGEzOWJiN2YxYzkwMTQ5ZGEzY2RhMDI2NTA5ZGQ3ZDU5MTdlYTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRW YWx1ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRW YWx1ZS5oCkBAIC04MCwxMCArODAsMTEgQEAgcHVibGljOgogCiAgICAgLy8gRGVzZXJpYWxpemVz IHRoZSB2YWx1ZSAoaW4gdGhlIGN1cnJlbnQgY29udGV4dCkuIFJldHVybnMgYSBudWxsIHZhbHVl IGluCiAgICAgLy8gY2FzZSBvZiBmYWlsdXJlLgotICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBk ZXNlcmlhbGl6ZShNZXNzYWdlUG9ydEFycmF5KiA9IDAsIHY4OjpJc29sYXRlKiA9IDApOworICAg IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBkZXNlcmlhbGl6ZShNZXNzYWdlUG9ydEFycmF5KiA9IDAp OworICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBkZXNlcmlhbGl6ZSh2ODo6SXNvbGF0ZSosIE1l c3NhZ2VQb3J0QXJyYXkqID0gMCk7CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIFNjcmlw dFZhbHVlIGRlc2VyaWFsaXplRm9ySW5zcGVjdG9yKFNjcmlwdFN0YXRlKiwgdjg6Oklzb2xhdGUq ID0gMCk7CisgICAgU2NyaXB0VmFsdWUgZGVzZXJpYWxpemVGb3JJbnNwZWN0b3IoU2NyaXB0U3Rh dGUqKTsKICNlbmRpZgogCiAgICAgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JVUkxzKCkgY29u c3QgeyByZXR1cm4gbV9ibG9iVVJMczsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4SGlzdG9yeUN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9jdXN0b20vVjhIaXN0b3J5Q3VzdG9tLmNwcAppbmRleCBmNDYzYzIzYTExNmYyYjlk M2M5NTg4ZGI1ZWQxMTE2ZWE4ODQ5YzJiLi4wMWVjZGYwY2NmZTliZTlkZDdhYWI0YmNjMzJlZDM0 NDJiY2E2MDNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20v VjhIaXN0b3J5Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhIaXN0b3J5Q3VzdG9tLmNwcApAQCAtNTEsNyArNTEsNyBAQCB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gVjhIaXN0b3J5OjpzdGF0ZUFjY2Vzc29yR2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5n PiBuYW1lLAogICAgICAgICByZXR1cm4gdmFsdWU7CiAKICAgICBTZXJpYWxpemVkU2NyaXB0VmFs dWUqIHNlcmlhbGl6ZWQgPSBoaXN0b3J5LT5zdGF0ZSgpOwotICAgIHZhbHVlID0gc2VyaWFsaXpl ZCA/IHNlcmlhbGl6ZWQtPmRlc2VyaWFsaXplKDAsIGluZm8uR2V0SXNvbGF0ZSgpKSA6IHY4OjpI YW5kbGU8djg6OlZhbHVlPih2OE51bGwoaW5mby5HZXRJc29sYXRlKCkpKTsKKyAgICB2YWx1ZSA9 IHNlcmlhbGl6ZWQgPyBzZXJpYWxpemVkLT5kZXNlcmlhbGl6ZShpbmZvLkdldElzb2xhdGUoKSkg OiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4odjhOdWxsKGluZm8uR2V0SXNvbGF0ZSgpKSk7CiAgICAg aW5mby5Ib2xkZXIoKS0+U2V0SGlkZGVuVmFsdWUoVjhIaWRkZW5Qcm9wZXJ0eU5hbWU6OnN0YXRl KCksIHZhbHVlKTsKIAogICAgIHJldHVybiB2YWx1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VFdmVudEN1c3RvbS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlRXZlbnRDdXN0b20uY3BwCmluZGV4 IDNkMmM5NjI0OWZmNzNlZTUwMmEwODRiN2Y0YjE0NTNlMjM2MWUwMWYuLmRhNWIxZmQ3NTBlMjg0 NmRkMDFmMGQzYjllY2E0NjIzNzZjNDAwM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VFdmVudEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TWVzc2FnZUV2ZW50Q3VzdG9tLmNwcApAQCAtNTks NyArNTksNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhNZXNzYWdlRXZlbnQ6OmRhdGFBY2Nl c3NvckdldHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4gbgogCiAgICAgY2FzZSBNZXNzYWdlRXZl bnQ6OkRhdGFUeXBlU2VyaWFsaXplZFNjcmlwdFZhbHVlOgogICAgICAgICBpZiAoU2VyaWFsaXpl ZFNjcmlwdFZhbHVlKiBzZXJpYWxpemVkVmFsdWUgPSBldmVudC0+ZGF0YUFzU2VyaWFsaXplZFNj cmlwdFZhbHVlKCkpCi0gICAgICAgICAgICByZXN1bHQgPSBzZXJpYWxpemVkVmFsdWUtPmRlc2Vy aWFsaXplKGV2ZW50LT5wb3J0cygpLCBpbmZvLkdldElzb2xhdGUoKSk7CisgICAgICAgICAgICBy ZXN1bHQgPSBzZXJpYWxpemVkVmFsdWUtPmRlc2VyaWFsaXplKGluZm8uR2V0SXNvbGF0ZSgpLCBl dmVudC0+cG9ydHMoKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHJlc3VsdCA9IHY4TnVs bChpbmZvLkdldElzb2xhdGUoKSk7CiAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4UG9wU3RhdGVFdmVudEN1c3RvbS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhQb3BTdGF0ZUV2ZW50Q3VzdG9tLmNw cAppbmRleCBmNTNjMWZlZDVkNDRkZjg0N2Y1MGIwODc4NGEyNTI0YTgzZjVlODU4Li5hYTFhNjhl N2VjMTc5OTllOWUzNWI0NDRlMzMxOTJlYzY0ZWU5YjM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhQb3BTdGF0ZUV2ZW50Q3VzdG9tLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhQb3BTdGF0ZUV2ZW50Q3VzdG9tLmNw cApAQCAtNzYsMTAgKzc2LDEwIEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFBvcFN0YXRlRXZl bnQ6OnN0YXRlQWNjZXNzb3JHZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+CiAgICAgICAgICAg ICBpZiAoIXJlc3VsdC5Jc0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGNhY2hlU3Rh dGUoaW5mby5Ib2xkZXIoKSwgcmVzdWx0KTsKICAgICAgICAgfQotICAgICAgICByZXN1bHQgPSBl dmVudC0+c2VyaWFsaXplZFN0YXRlKCktPmRlc2VyaWFsaXplKDAsIGluZm8uR2V0SXNvbGF0ZSgp KTsKKyAgICAgICAgcmVzdWx0ID0gZXZlbnQtPnNlcmlhbGl6ZWRTdGF0ZSgpLT5kZXNlcmlhbGl6 ZShpbmZvLkdldElzb2xhdGUoKSk7CiAgICAgICAgIHY4SGlzdG9yeS0+U2V0SGlkZGVuVmFsdWUo VjhIaWRkZW5Qcm9wZXJ0eU5hbWU6OnN0YXRlKCksIHJlc3VsdCk7CiAgICAgfSBlbHNlCi0gICAg ICAgIHJlc3VsdCA9IGV2ZW50LT5zZXJpYWxpemVkU3RhdGUoKS0+ZGVzZXJpYWxpemUoMCwgaW5m by5HZXRJc29sYXRlKCkpOworICAgICAgICByZXN1bHQgPSBldmVudC0+c2VyaWFsaXplZFN0YXRl KCktPmRlc2VyaWFsaXplKGluZm8uR2V0SXNvbGF0ZSgpKTsKIAogICAgIHJldHVybiBjYWNoZVN0 YXRlKGluZm8uSG9sZGVyKCksIHJlc3VsdCk7CiB9Cg==