84259 2012-04-18 11:27:13 -0700 [V8] Pass Isolate to toV8() (Part2) 2012-04-23 11:43:14 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84074 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 604923 0 haraken 2012-04-18 11:27:13 -0700 The objective is to pass Isolate to all toV8()s. Since there are a lot of toV8(), I'll make the change step by step. In this bug, we pass Isolate to toV8() in several custom bindings. 604927 1 137729 haraken 2012-04-18 11:29:25 -0700 Created attachment 137729 Patch 607884 2 137729 webkit.review.bot 2012-04-23 11:43:10 -0700 Comment on attachment 137729 Patch Clearing flags on attachment: 137729 Committed r114924: <http://trac.webkit.org/changeset/114924> 607885 3 webkit.review.bot 2012-04-23 11:43:14 -0700 All reviewed patches have been landed. Closing bug. 137729 2012-04-18 11:29:25 -0700 2012-04-23 11:43:10 -0700 Patch bug-84259-20120418112924.patch text/plain 12065 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQxMzY3NzFiNmIzMGZm ZmIzNzBhOWMxN2MwYjlkNTc3NTVmNzU1Yi4uMmRlOGRhYjk2MjhiZDAwNDg0NGI5MWYwYzIyOTEw NzI5MzlkMGViOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEyLTA0LTE4ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFBhc3MgSXNv bGF0ZSB0byB0b1Y4KCkgKFBhcnQyKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODQyNTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGUgb2JqZWN0aXZlIGlzIHRvIHBhc3MgSXNvbGF0ZSB0byBhbGwgdG9W OCgpcy4KKyAgICAgICAgU2luY2UgdGhlcmUgYXJlIGEgbG90IG9mIHRvVjgoKSwgSSdsbCBtYWtl IHRoZSBjaGFuZ2UKKyAgICAgICAgc3RlcCBieSBzdGVwLiBUaGlzIHBhdGNoIHBhc3NlcyBJc29s YXRlIHRvIHRvVjgoKSBpbgorICAgICAgICBzZXZlcmFsIGN1c3RvbSBiaW5kaW5ncy4KKworICAg ICAgICBObyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogYmluZGlu Z3MvdjgvY3VzdG9tL1Y4QmxvYkN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b1Y4KToK KyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhDU1NSdWxlQ3VzdG9tLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OnRvVjgpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOENTU1N0 eWxlU2hlZXRDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9WOCk6CisgICAgICAgICog YmluZGluZ3MvdjgvY3VzdG9tL1Y4Q1NTVmFsdWVDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6dG9WOCk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q2FudmFzUmVuZGVyaW5n Q29udGV4dDJEQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRvVjhPYmplY3QpOgorICAg ICAgICAoV2ViQ29yZTo6VjhDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OnN0cm9rZVN0eWxlQWNj ZXNzb3JHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VjhDYW52YXNSZW5kZXJpbmdDb250ZXh0 MkQ6OmZpbGxTdHlsZUFjY2Vzc29yR2V0dGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0 b20vVjhDb25zb2xlQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4Q29uc29sZTo6bWVt b3J5QWNjZXNzb3JHZXR0ZXIpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3Rv bVNRTFN0YXRlbWVudEVycm9yQ2FsbGJhY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhTUUxT dGF0ZW1lbnRFcnJvckNhbGxiYWNrOjpoYW5kbGVFdmVudCk6CisgICAgICAgICogYmluZGluZ3Mv djgvY3VzdG9tL1Y4RE9NU3RyaW5nTWFwQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRv VjgpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVRva2VuTGlzdEN1c3RvbS5j cHA6CisgICAgICAgIChXZWJDb3JlOjp0b1Y4KToKKwogMjAxMi0wNC0xOCAgRG9taW5payBSw7Z0 dHNjaGVzICA8ZG9taW5pay5yb3R0c2NoZXNAbGludXguaW50ZWwuY29tPgogCiAgICAgICAgIFtF RkxdW0RSVF0gQGZvbnQtZmFjZSBzdXBwb3J0IGZhaWxzIG9uIEVGTApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4QmxvYkN1c3RvbS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhCbG9iQ3VzdG9tLmNwcAppbmRleCA0ODhiZmYz NGNmZDgzYzIxNGNkZDFiYWRhNjhhN2M0YjAyZWZlOTNjLi4zYzY1YjZjYjA1ZGQ2ZGM0ZmJhZjZl YWNkMGNiODU1NmQ2YmQxNzJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhCbG9iQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhCbG9iQ3VzdG9tLmNwcApAQCAtNDQsNyArNDQsNyBAQCB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gdG9WOChCbG9iKiBpbXBsLCB2ODo6SXNvbGF0ZSogaXNvbGF0ZSkKICAgICAgICAg cmV0dXJuIHY4OjpOdWxsKCk7CiAKICAgICBpZiAoaW1wbC0+aXNGaWxlKCkpCi0gICAgICAgIHJl dHVybiB0b1Y4KHN0YXRpY19jYXN0PEZpbGUqPihpbXBsKSk7CisgICAgICAgIHJldHVybiB0b1Y4 KHN0YXRpY19jYXN0PEZpbGUqPihpbXBsKSwgaXNvbGF0ZSk7CiAKICAgICByZXR1cm4gVjhCbG9i Ojp3cmFwKGltcGwpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4Q1NTUnVsZUN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9j dXN0b20vVjhDU1NSdWxlQ3VzdG9tLmNwcAppbmRleCA0ODU2YjZkZGEwZWFlODQxMDMzY2ViOGM2 NjJmMDRlZGQyM2RjMzkzLi4zZWE0NjdmZDRjZWQ4YjIwZDg5OGI5NWUyMWVmMTRjM2IzYzhhMzNl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDU1NSdWxl Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDU1NS dWxlQ3VzdG9tLmNwcApAQCAtNTQsMjMgKzU0LDIzIEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB0 b1Y4KENTU1J1bGUqIGltcGwsIHY4OjpJc29sYXRlKiBpc29sYXRlKQogICAgICAgICAvLyAtPiBV c2UgdGhlIGJhc2UgY2xhc3Mgd3JhcHBlciBoZXJlLgogICAgICAgICByZXR1cm4gVjhDU1NSdWxl Ojp3cmFwKGltcGwpOwogICAgIGNhc2UgQ1NTUnVsZTo6U1RZTEVfUlVMRToKLSAgICAgICAgcmV0 dXJuIHRvVjgoc3RhdGljX2Nhc3Q8Q1NTU3R5bGVSdWxlKj4oaW1wbCkpOworICAgICAgICByZXR1 cm4gdG9WOChzdGF0aWNfY2FzdDxDU1NTdHlsZVJ1bGUqPihpbXBsKSwgaXNvbGF0ZSk7CiAgICAg Y2FzZSBDU1NSdWxlOjpDSEFSU0VUX1JVTEU6Ci0gICAgICAgIHJldHVybiB0b1Y4KHN0YXRpY19j YXN0PENTU0NoYXJzZXRSdWxlKj4oaW1wbCkpOworICAgICAgICByZXR1cm4gdG9WOChzdGF0aWNf Y2FzdDxDU1NDaGFyc2V0UnVsZSo+KGltcGwpLCBpc29sYXRlKTsKICAgICBjYXNlIENTU1J1bGU6 OklNUE9SVF9SVUxFOgotICAgICAgICByZXR1cm4gdG9WOChzdGF0aWNfY2FzdDxDU1NJbXBvcnRS dWxlKj4oaW1wbCkpOworICAgICAgICByZXR1cm4gdG9WOChzdGF0aWNfY2FzdDxDU1NJbXBvcnRS dWxlKj4oaW1wbCksIGlzb2xhdGUpOwogICAgIGNhc2UgQ1NTUnVsZTo6TUVESUFfUlVMRToKLSAg ICAgICAgcmV0dXJuIHRvVjgoc3RhdGljX2Nhc3Q8Q1NTTWVkaWFSdWxlKj4oaW1wbCkpOworICAg ICAgICByZXR1cm4gdG9WOChzdGF0aWNfY2FzdDxDU1NNZWRpYVJ1bGUqPihpbXBsKSwgaXNvbGF0 ZSk7CiAgICAgY2FzZSBDU1NSdWxlOjpGT05UX0ZBQ0VfUlVMRToKLSAgICAgICAgcmV0dXJuIHRv Vjgoc3RhdGljX2Nhc3Q8Q1NTRm9udEZhY2VSdWxlKj4oaW1wbCkpOworICAgICAgICByZXR1cm4g dG9WOChzdGF0aWNfY2FzdDxDU1NGb250RmFjZVJ1bGUqPihpbXBsKSwgaXNvbGF0ZSk7CiAgICAg Y2FzZSBDU1NSdWxlOjpQQUdFX1JVTEU6Ci0gICAgICAgIHJldHVybiB0b1Y4KHN0YXRpY19jYXN0 PENTU1BhZ2VSdWxlKj4oaW1wbCkpOworICAgICAgICByZXR1cm4gdG9WOChzdGF0aWNfY2FzdDxD U1NQYWdlUnVsZSo+KGltcGwpLCBpc29sYXRlKTsKICAgICBjYXNlIENTU1J1bGU6OldFQktJVF9L RVlGUkFNRV9SVUxFOgotICAgICAgICByZXR1cm4gdG9WOChzdGF0aWNfY2FzdDxXZWJLaXRDU1NL ZXlmcmFtZVJ1bGUqPihpbXBsKSk7CisgICAgICAgIHJldHVybiB0b1Y4KHN0YXRpY19jYXN0PFdl YktpdENTU0tleWZyYW1lUnVsZSo+KGltcGwpLCBpc29sYXRlKTsKICAgICBjYXNlIENTU1J1bGU6 OldFQktJVF9LRVlGUkFNRVNfUlVMRToKLSAgICAgICAgcmV0dXJuIHRvVjgoc3RhdGljX2Nhc3Q8 V2ViS2l0Q1NTS2V5ZnJhbWVzUnVsZSo+KGltcGwpKTsKKyAgICAgICAgcmV0dXJuIHRvVjgoc3Rh dGljX2Nhc3Q8V2ViS2l0Q1NTS2V5ZnJhbWVzUnVsZSo+KGltcGwpLCBpc29sYXRlKTsKICAgICBj YXNlIENTU1J1bGU6OldFQktJVF9SRUdJT05fUlVMRToKLSAgICAgICAgcmV0dXJuIHRvVjgoc3Rh dGljX2Nhc3Q8V2ViS2l0Q1NTUmVnaW9uUnVsZSo+KGltcGwpKTsKKyAgICAgICAgcmV0dXJuIHRv Vjgoc3RhdGljX2Nhc3Q8V2ViS2l0Q1NTUmVnaW9uUnVsZSo+KGltcGwpLCBpc29sYXRlKTsKICAg ICB9CiAgICAgcmV0dXJuIFY4Q1NTUnVsZTo6d3JhcChpbXBsKTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOENTU1N0eWxlU2hlZXRDdXN0b20uY3Bw IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q1NTU3R5bGVTaGVldEN1c3Rv bS5jcHAKaW5kZXggYWUwMjMwOTcyYTAwNTRmNzhiNTllOGZkOWFmYjgxMTA5YWFlY2M4My4uYzU0 YzczZjUxYTVmNDA2YzExYjhiNjhjNWI1NjhlNzk5ZTkwN2E0YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q1NTU3R5bGVTaGVldEN1c3RvbS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q1NTU3R5bGVTaGVldEN1c3Rv bS5jcHAKQEAgLTQ0LDcgKzQ0LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHRvVjgoQ1NTU3R5 bGVTaGVldCogaW1wbCwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCiAgICAgLy8gQWRkIGEgaGlkZGVu IHJlZmVyZW5jZSBmcm9tIHN0eWxlc2hlZXQgb2JqZWN0IHRvIGl0cyBvd25lciBub2RlLgogICAg IE5vZGUqIG93bmVyTm9kZSA9IGltcGwtPm93bmVyTm9kZSgpOwogICAgIGlmIChvd25lck5vZGUg JiYgIXdyYXBwZXIuSXNFbXB0eSgpKQotICAgICAgICBWOERPTVdyYXBwZXI6OnNldE5hbWVkSGlk ZGVuUmVmZXJlbmNlKHdyYXBwZXIsICJvd25lck5vZGUiLCB0b1Y4KG93bmVyTm9kZSkpOworICAg ICAgICBWOERPTVdyYXBwZXI6OnNldE5hbWVkSGlkZGVuUmVmZXJlbmNlKHdyYXBwZXIsICJvd25l ck5vZGUiLCB0b1Y4KG93bmVyTm9kZSwgaXNvbGF0ZSkpOwogICAgIHJldHVybiB3cmFwcGVyOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDU1NW YWx1ZUN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDU1NW YWx1ZUN1c3RvbS5jcHAKaW5kZXggZjA2OTNjMjI0NzA0NjFkYjIyYTYzNTJlNjFlOGY5MjUyNTcy NTlkMy4uZDFiNDA5YTUwMDdmYjYxNTdjYjAzMzU5Nzc5ZjNmOWE4ZWMwYjk4NSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q1NTVmFsdWVDdXN0b20uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOENTU1ZhbHVlQ3VzdG9t LmNwcApAQCAtNDcsMTYgKzQ3LDE2IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB0b1Y4KENTU1Zh bHVlKiBpbXBsLCB2ODo6SXNvbGF0ZSogaXNvbGF0ZSkKICAgICBpZiAoIWltcGwpCiAgICAgICAg IHJldHVybiB2ODo6TnVsbCgpOwogICAgIGlmIChpbXBsLT5pc1dlYktpdENTU1RyYW5zZm9ybVZh bHVlKCkpCi0gICAgICAgIHJldHVybiB0b1Y4KHN0YXRpY19jYXN0PFdlYktpdENTU1RyYW5zZm9y bVZhbHVlKj4oaW1wbCkpOworICAgICAgICByZXR1cm4gdG9WOChzdGF0aWNfY2FzdDxXZWJLaXRD U1NUcmFuc2Zvcm1WYWx1ZSo+KGltcGwpLCBpc29sYXRlKTsKICAgICBpZiAoaW1wbC0+aXNWYWx1 ZUxpc3QoKSkKLSAgICAgICAgcmV0dXJuIHRvVjgoc3RhdGljX2Nhc3Q8Q1NTVmFsdWVMaXN0Kj4o aW1wbCkpOworICAgICAgICByZXR1cm4gdG9WOChzdGF0aWNfY2FzdDxDU1NWYWx1ZUxpc3QqPihp bXBsKSwgaXNvbGF0ZSk7CiAgICAgaWYgKGltcGwtPmlzUHJpbWl0aXZlVmFsdWUoKSkKLSAgICAg ICAgcmV0dXJuIHRvVjgoc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPihpbXBsKSk7Cisg ICAgICAgIHJldHVybiB0b1Y4KHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4oaW1wbCks IGlzb2xhdGUpOwogI2lmIEVOQUJMRShTVkcpCiAgICAgaWYgKGltcGwtPmlzU1ZHUGFpbnQoKSkK LSAgICAgICAgcmV0dXJuIHRvVjgoc3RhdGljX2Nhc3Q8U1ZHUGFpbnQqPihpbXBsKSk7CisgICAg ICAgIHJldHVybiB0b1Y4KHN0YXRpY19jYXN0PFNWR1BhaW50Kj4oaW1wbCksIGlzb2xhdGUpOwog ICAgIGlmIChpbXBsLT5pc1NWR0NvbG9yKCkpCi0gICAgICAgIHJldHVybiB0b1Y4KHN0YXRpY19j YXN0PFNWR0NvbG9yKj4oaW1wbCkpOworICAgICAgICByZXR1cm4gdG9WOChzdGF0aWNfY2FzdDxT VkdDb2xvcio+KGltcGwpLCBpc29sYXRlKTsKICNlbmRpZgogICAgIHJldHVybiBWOENTU1ZhbHVl Ojp3cmFwKGltcGwpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOENhbnZhc1JlbmRlcmluZ0NvbnRleHQyREN1c3RvbS5j cHAKaW5kZXggMmZlYmQ4MjA1ODE5MzBkOGNjMTkyNDQ0NDE2ZTg0MjdlYTZmM2E4Ny4uNzlhNjA1 NTJmOTU1N2VjZmY2ZWJkZWFjNDFiOThkYzMzNzRhYzE4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQ3VzdG9t LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDYW52YXNSZW5k ZXJpbmdDb250ZXh0MkRDdXN0b20uY3BwCkBAIC00OSwxMyArNDksMTMgQEAKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCi1zdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHRvVjhPYmplY3QoQ2Fu dmFzU3R5bGUqIHN0eWxlKQorc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB0b1Y4T2JqZWN0 KENhbnZhc1N0eWxlKiBzdHlsZSwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7CiAgICAgaWYgKHN0 eWxlLT5jYW52YXNHcmFkaWVudCgpKQotICAgICAgICByZXR1cm4gdG9WOChzdHlsZS0+Y2FudmFz R3JhZGllbnQoKSk7CisgICAgICAgIHJldHVybiB0b1Y4KHN0eWxlLT5jYW52YXNHcmFkaWVudCgp LCBpc29sYXRlKTsKIAogICAgIGlmIChzdHlsZS0+Y2FudmFzUGF0dGVybigpKQotICAgICAgICBy ZXR1cm4gdG9WOChzdHlsZS0+Y2FudmFzUGF0dGVybigpKTsKKyAgICAgICAgcmV0dXJuIHRvVjgo c3R5bGUtPmNhbnZhc1BhdHRlcm4oKSwgaXNvbGF0ZSk7CiAKICAgICByZXR1cm4gdjhTdHJpbmco c3R5bGUtPmNvbG9yKCkpOwogfQpAQCAtNzQsNyArNzQsNyBAQCBzdGF0aWMgUGFzc1JlZlB0cjxD YW52YXNTdHlsZT4gdG9DYW52YXNTdHlsZSh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUpCiB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OnN0cm9rZVN0 eWxlQWNjZXNzb3JHZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIGNvbnN0IHY4OjpB Y2Nlc3NvckluZm8mIGluZm8pCiB7CiAgICAgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEKiBpbXBs ID0gVjhDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OnRvTmF0aXZlKGluZm8uSG9sZGVyKCkpOwot ICAgIHJldHVybiB0b1Y4T2JqZWN0KGltcGwtPnN0cm9rZVN0eWxlKCkpOworICAgIHJldHVybiB0 b1Y4T2JqZWN0KGltcGwtPnN0cm9rZVN0eWxlKCksIGluZm8uR2V0SXNvbGF0ZSgpKTsKIH0KIAog dm9pZCBWOENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6c3Ryb2tlU3R5bGVBY2Nlc3NvclNldHRl cih2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZSwgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gdmFsdWUs IGNvbnN0IHY4OjpBY2Nlc3NvckluZm8mIGluZm8pCkBAIC04OSw3ICs4OSw3IEBAIHZvaWQgVjhD YW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OnN0cm9rZVN0eWxlQWNjZXNzb3JTZXR0ZXIodjg6Okxv Y2FsPHY4OjpTdHJpbmc+CiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhDYW52YXNSZW5kZXJpbmdD b250ZXh0MkQ6OmZpbGxTdHlsZUFjY2Vzc29yR2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBu YW1lLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQogewogICAgIENhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRCogaW1wbCA9IFY4Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjp0b05hdGl2ZShp bmZvLkhvbGRlcigpKTsKLSAgICByZXR1cm4gdG9WOE9iamVjdChpbXBsLT5maWxsU3R5bGUoKSk7 CisgICAgcmV0dXJuIHRvVjhPYmplY3QoaW1wbC0+ZmlsbFN0eWxlKCksIGluZm8uR2V0SXNvbGF0 ZSgpKTsKIH0KIAogdm9pZCBWOENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZmlsbFN0eWxlQWNj ZXNzb3JTZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIHY4OjpMb2NhbDx2ODo6VmFs dWU+IHZhbHVlLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q29uc29sZUN1c3RvbS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDb25zb2xlQ3VzdG9tLmNwcAppbmRleCBk ZmNlNzM0YjFlYjA4NjhmNDE5OTQ4MGFhZGNjN2U3Y2FjNmQ3NDMwLi5lN2UwZWU3ZTBiZDUyY2I1 OTViZjFmMTc5Mzk3OGNlYTYwOTIxZmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9jdXN0b20vVjhDb25zb2xlQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhDb25zb2xlQ3VzdG9tLmNwcApAQCAtOTQsNyArOTQsNyBAQCB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhDb25zb2xlOjptZW1vcnlBY2Nlc3NvckdldHRlcih2ODo6 TG9jYWw8djg6OlN0cmluZz4gbmFtZQogewogICAgIElOQ19TVEFUUygiRE9NLkNvbnNvbGUubWVt b3J5QWNjZXNzb3JHZXR0ZXIiKTsKICAgICBDb25zb2xlKiBpbXAgPSBWOENvbnNvbGU6OnRvTmF0 aXZlKGluZm8uSG9sZGVyKCkpOwotICAgIHJldHVybiB0b1Y4KGltcC0+bWVtb3J5KCkpOworICAg IHJldHVybiB0b1Y4KGltcC0+bWVtb3J5KCksIGluZm8uR2V0SXNvbGF0ZSgpKTsKIH0KIAogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvY3VzdG9tL1Y4Q3VzdG9tU1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjay5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0b21TUUxTdGF0ZW1lbnRFcnJvckNhbGxi YWNrLmNwcAppbmRleCA5ZWUyN2ZiNzJhNTY5MGY0YmFkNjllYTkwYTZlYTIwODdkYmFmZTRkLi5j MDc5ODZiNzZkYTJhOTZmMmExYmNhOGI4NTU5MWRhNmJjOTg4MTk0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0b21TUUxTdGF0ZW1lbnRFcnJvckNh bGxiYWNrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0 b21TUUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNrLmNwcApAQCAtNTYsOCArNTYsOCBAQCBib29sIFY4 U1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjazo6aGFuZGxlRXZlbnQoU1FMVHJhbnNhY3Rpb24qIHRy YW5zYWN0aW9uLCBTUUxFcgogCiAgICAgdjg6OkNvbnRleHQ6OlNjb3BlIHNjb3BlKHY4Q29udGV4 dCk7CiAKLSAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdHJhbnNhY3Rpb25IYW5kbGUgPSB0b1Y4 KHRyYW5zYWN0aW9uKTsKLSAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gZXJyb3JIYW5kbGUgPSB0 b1Y4KGVycm9yKTsKKyAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdHJhbnNhY3Rpb25IYW5kbGUg PSB0b1Y4KHRyYW5zYWN0aW9uLCAwKTsKKyAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gZXJyb3JI YW5kbGUgPSB0b1Y4KGVycm9yLCAwKTsKICAgICBpZiAodHJhbnNhY3Rpb25IYW5kbGUuSXNFbXB0 eSgpIHx8IGVycm9ySGFuZGxlLklzRW1wdHkoKSkgewogICAgICAgICBpZiAoIWlzU2NyaXB0Q29u dHJvbGxlclRlcm1pbmF0aW5nKCkpCiAgICAgICAgICAgICBDUkFTSCgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NU3RyaW5nTWFwQ3VzdG9tLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVN0cmluZ01hcEN1c3Rv bS5jcHAKaW5kZXggZjJhMjkxYWM2NTEzNGIyZDA4NWYzYTk0Zjk5MzBmMGMyNmFlMzk1My4uODU5 MGI3M2FmNGZiMjcyNmRmZjlhN2JiYjlhN2JjYThhNjE1YjIwNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NU3RyaW5nTWFwQ3VzdG9tLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhET01TdHJpbmdNYXBDdXN0b20u Y3BwCkBAIC05Miw3ICs5Miw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB0b1Y4KERPTVN0cmlu Z01hcCogaW1wbCwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCiAgICAgLy8gQWRkIGEgaGlkZGVuIHJl ZmVyZW5jZSBmcm9tIHRoZSBlbGVtZW50IHRvIHRoZSBET01TdHJpbmdNYXAuCiAgICAgRWxlbWVu dCogZWxlbWVudCA9IGltcGwtPmVsZW1lbnQoKTsKICAgICBpZiAoIXdyYXBwZXIuSXNFbXB0eSgp ICYmIGVsZW1lbnQpIHsKLSAgICAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGVsZW1lbnRWYWx1 ZSA9IHRvVjgoZWxlbWVudCk7CisgICAgICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBlbGVtZW50 VmFsdWUgPSB0b1Y4KGVsZW1lbnQsIGlzb2xhdGUpOwogICAgICAgICBpZiAoIWVsZW1lbnRWYWx1 ZS5Jc0VtcHR5KCkgJiYgZWxlbWVudFZhbHVlLT5Jc09iamVjdCgpKQogICAgICAgICAgICAgZWxl bWVudFZhbHVlLkFzPHY4OjpPYmplY3Q+KCktPlNldEhpZGRlblZhbHVlKFY4SGlkZGVuUHJvcGVy dHlOYW1lOjpkb21TdHJpbmdNYXAoKSwgd3JhcHBlcik7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NVG9rZW5MaXN0Q3VzdG9tLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVRva2VuTGlzdEN1c3RvbS5j cHAKaW5kZXggY2YyMGMxMjRmOTMyYmY2ZmZiMjM0MTZlYjI5YzU1YTJmNmE2NWM0Yi4uYjZhMGFh NjBjMTE1ZmMxZmZiN2UxYmZiNDRhODI4ZjBiOTk0MmQwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NVG9rZW5MaXN0Q3VzdG9tLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhET01Ub2tlbkxpc3RDdXN0b20uY3Bw CkBAIC00Niw3ICs0Niw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB0b1Y4KERPTVRva2VuTGlz dCogaW1wbCwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCiAgICAgLy8gQWRkIGEgaGlkZGVuIHJlZmVy ZW5jZSBmcm9tIHRoZSBlbGVtZW50IHRvIHRoZSBET01Ub2tlbkxpc3QuCiAgICAgRWxlbWVudCog ZWxlbWVudCA9IGltcGwtPmVsZW1lbnQoKTsKICAgICBpZiAoIXdyYXBwZXIuSXNFbXB0eSgpICYm IGVsZW1lbnQpIHsKLSAgICAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGVsZW1lbnRWYWx1ZSA9 IHRvVjgoZWxlbWVudCk7CisgICAgICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBlbGVtZW50VmFs dWUgPSB0b1Y4KGVsZW1lbnQsIGlzb2xhdGUpOwogICAgICAgICBpZiAoIWVsZW1lbnRWYWx1ZS5J c0VtcHR5KCkgJiYgZWxlbWVudFZhbHVlLT5Jc09iamVjdCgpKQogICAgICAgICAgICAgZWxlbWVu dFZhbHVlLkFzPHY4OjpPYmplY3Q+KCktPlNldEhpZGRlblZhbHVlKFY4SGlkZGVuUHJvcGVydHlO YW1lOjpkb21Ub2tlbkxpc3QoKSwgd3JhcHBlcik7CiAgICAgfQo=