84257 2012-04-18 11:05:32 -0700 [V8][Refactoring] Remove V8Proxy::toV8() 2012-04-23 11:33:24 -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 604900 0 haraken 2012-04-18 11:05:32 -0700 Some constructorCallback()s are using V8Proxy::toV8(), other constructorCallback()s are directly using setJSWrapperForXXX() (XXX can be DOMObject, ActiveDOMObject, Node or ActiveNode). We should unify them. Considering the fact that V8Proxy::toV8() just supports XXX=DOMObject and thus is not flexible, replacing V8Proxy::toV8() with setJSWrapperForXXX() would make sense. 604905 1 137726 haraken 2012-04-18 11:10:11 -0700 Created attachment 137726 Patch 607875 2 137726 webkit.review.bot 2012-04-23 11:33:19 -0700 Comment on attachment 137726 Patch Clearing flags on attachment: 137726 Committed r114922: <http://trac.webkit.org/changeset/114922> 607876 3 webkit.review.bot 2012-04-23 11:33:24 -0700 All reviewed patches have been landed. Closing bug. 137726 2012-04-18 11:10:11 -0700 2012-04-23 11:33:19 -0700 Patch bug-84257-20120418111010.patch text/plain 11532 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQxMzY3NzFiNmIzMGZm ZmIzNzBhOWMxN2MwYjlkNTc3NTVmNzU1Yi4uNzA3MzIyMmVlNGJlNjc3YTM2NGFlYmRiZTA4YTgz YWM3MzIzYTY4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEyLTA0LTE4ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdW1JlZmFjdG9y aW5nXSBSZW1vdmUgVjhQcm94eTo6dG9WOCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04NDI1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNvbWUgY29uc3RydWN0b3JDYWxsYmFjaygpcyBhcmUgdXNpbmcg VjhQcm94eTo6dG9WOCgpLAorICAgICAgICBvdGhlciBjb25zdHJ1Y3RvckNhbGxiYWNrKClzIGFy ZSBkaXJlY3RseSB1c2luZyBzZXRKU1dyYXBwZXJGb3JYWFgoKQorICAgICAgICAoWFhYIGNhbiBi ZSBET01PYmplY3QsIEFjdGl2ZURPTU9iamVjdCwgTm9kZSBvciBBY3RpdmVOb2RlKS4KKyAgICAg ICAgV2Ugc2hvdWxkIHVuaWZ5IHRoZW0uCisKKyAgICAgICAgQ29uc2lkZXJpbmcgdGhlIGZhY3Qg dGhhdCBWOFByb3h5Ojp0b1Y4KCkganVzdCBzdXBwb3J0cworICAgICAgICBYWFg9RE9NT2JqZWN0 IGFuZCB0aHVzIGlzIG5vdCBmbGV4aWJsZSwgcmVwbGFjaW5nIFY4UHJveHk6OnRvVjgoKQorICAg ICAgICB3aXRoIHNldEpTV3JhcHBlckZvckRPTU9iamVjdCgpIHdvdWxkIG1ha2Ugc2Vuc2UuCisK KyAgICAgICAgTm8gdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIGJp bmRpbmdzL3Y4L1Y4UHJveHkuaDogUmVtb3ZlZCB0b1Y4KCkuCisKKyAgICAgICAgKiBiaW5kaW5n cy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbTogUmVwbGFjZWQgdG9WOCgpIHdpdGggc2V0SlNX cmFwcGVyRm9yRE9NT2JqZWN0KCkuCisgICAgICAgIChHZW5lcmF0ZUV2ZW50Q29uc3RydWN0b3JD YWxsYmFjayk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4QXJyYXlCdWZmZXJDdXN0 b20uY3BwOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlY4QXJyYXlCdWZmZXI6OmNvbnN0cnVj dG9yQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVy Vmlld0N1c3RvbS5oOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OmNvbnN0cnVjdFdlYkdMQXJy YXlXaXRoQXJyYXlCdWZmZXJBcmd1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpjb25zdHJ1Y3RX ZWJHTEFycmF5KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhET01Gb3JtRGF0YUN1 c3RvbS5jcHA6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6VjhET01Gb3JtRGF0YTo6Y29uc3Ry dWN0b3JDYWxsYmFjayk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YVZpZXdD dXN0b20uY3BwOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlY4RGF0YVZpZXc6OmNvbnN0cnVj dG9yQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VDaGFu bmVsQ29uc3RydWN0b3IuY3BwOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlY4TWVzc2FnZUNo YW5uZWw6OmNvbnN0cnVjdG9yQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3Rv bS9WOFdlYktpdFBvaW50Q29uc3RydWN0b3IuY3BwOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6 OlY4V2ViS2l0UG9pbnQ6OmNvbnN0cnVjdG9yQ2FsbGJhY2spOgorCisgICAgICAgICogYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEV2ZW50Q29uc3RydWN0b3IuY3BwOiBVcGRhdGVkIHJ1 bi1iaW5kaW5ncy10ZXN0cyByZXN1bHRzLgorICAgICAgICAoV2ViQ29yZTo6VjhUZXN0RXZlbnRD b25zdHJ1Y3Rvcjo6Y29uc3RydWN0b3JDYWxsYmFjayk6CisKIDIwMTItMDQtMTggIERvbWluaWsg UsO2dHRzY2hlcyAgPGRvbWluaWsucm90dHNjaGVzQGxpbnV4LmludGVsLmNvbT4KIAogICAgICAg ICBbRUZMXVtEUlRdIEBmb250LWZhY2Ugc3VwcG9ydCBmYWlscyBvbiBFRkwKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KaW5kZXggOTQ4 MGE2ODNhZTNkYWRiMTQ0NzJjMzhkOTlhZmQwNmU2YmE3Nzc2Ni4uNTk4MjVlMjI0Mjg5YzU2Zjdh ODBlMGUyZWVjNTRmZWY2MjY0Yzc3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KQEAgLTE4MTQsNyArMTgxNCw4IEBAIHY4OjpI YW5kbGU8djg6OlZhbHVlPiBWOCR7aW1wbENsYXNzTmFtZX06OmNvbnN0cnVjdG9yQ2FsbGJhY2so Y29uc3Qgdjg6OkFyZ3VtZW50CiAgICAgUmVmUHRyPCR7aW1wbENsYXNzTmFtZX0+IGV2ZW50ID0g JHtpbXBsQ2xhc3NOYW1lfTo6Y3JlYXRlKHR5cGUsIGV2ZW50SW5pdCk7CiAKICAgICBWOERPTVdy YXBwZXI6OnNldERPTVdyYXBwZXIoYXJncy5Ib2xkZXIoKSwgJmluZm8sIGV2ZW50LmdldCgpKTsK LSAgICByZXR1cm4gdG9WOChldmVudC5yZWxlYXNlKCksIGFyZ3MuSG9sZGVyKCkpOworICAgIFY4 RE9NV3JhcHBlcjo6c2V0SlNXcmFwcGVyRm9yRE9NT2JqZWN0KGV2ZW50LnJlbGVhc2UoKSwgdjg6 OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46Ok5ldyhhcmdzLkhvbGRlcigpKSk7CisgICAgcmV0dXJu IGFyZ3MuSG9sZGVyKCk7CiB9CiAKIGJvb2wgZmlsbCR7aW1wbENsYXNzTmFtZX1Jbml0KCR7aW1w bENsYXNzTmFtZX1Jbml0JiBldmVudEluaXQsIGNvbnN0IERpY3Rpb25hcnkmIG9wdGlvbnMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0 RXZlbnRDb25zdHJ1Y3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvVjgvVjhUZXN0RXZlbnRDb25zdHJ1Y3Rvci5jcHAKaW5kZXggOWQ2YTJmMDk4NmNhZTA3MzI0 MDU2ZGViNGEwNTMyNjNiNDNiNWIxNS4uM2ZkYjZjYjc4MDcyYmE4MjM1Y2YyMzY4ZmJiMTNhNWMy NDJhNjc4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L1Y4L1Y4VGVzdEV2ZW50Q29uc3RydWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RFdmVudENvbnN0cnVjdG9yLmNwcApAQCAtODYsNyAr ODYsOCBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhUZXN0RXZlbnRDb25zdHJ1Y3Rvcjo6Y29u c3RydWN0b3JDYWxsYmFjayhjb25zdCB2ODo6QXJndQogICAgIFJlZlB0cjxUZXN0RXZlbnRDb25z dHJ1Y3Rvcj4gZXZlbnQgPSBUZXN0RXZlbnRDb25zdHJ1Y3Rvcjo6Y3JlYXRlKHR5cGUsIGV2ZW50 SW5pdCk7CiAKICAgICBWOERPTVdyYXBwZXI6OnNldERPTVdyYXBwZXIoYXJncy5Ib2xkZXIoKSwg JmluZm8sIGV2ZW50LmdldCgpKTsKLSAgICByZXR1cm4gdG9WOChldmVudC5yZWxlYXNlKCksIGFy Z3MuSG9sZGVyKCkpOworICAgIFY4RE9NV3JhcHBlcjo6c2V0SlNXcmFwcGVyRm9yRE9NT2JqZWN0 KGV2ZW50LnJlbGVhc2UoKSwgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46Ok5ldyhhcmdzLkhv bGRlcigpKSk7CisgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CiB9CiAKIGJvb2wgZmlsbFRlc3RF dmVudENvbnN0cnVjdG9ySW5pdChUZXN0RXZlbnRDb25zdHJ1Y3RvckluaXQmIGV2ZW50SW5pdCwg Y29uc3QgRGljdGlvbmFyeSYgb3B0aW9ucykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4UHJveHkuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHku aAppbmRleCAyMWVkZjVkMzNjOWFhZDA5YjU3ODQ4YWI1YWIwMWNlOGE5MGNiNjA2Li4wMTIxYzFh N2Q5NGMwMmZjZTIwODNjMWIyYzM4NGZmYzFjYTVkMmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvVjhQcm94eS5oCkBAIC0zNDksMTYgKzM0OSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgTWFya0luZGVwZW5kZW50LAogICAgICAgICBEb05vdE1hcmtJbmRlcGVuZGVudAogICAg IH07Ci0KLSAgICB0ZW1wbGF0ZSA8Y2xhc3MgVD4gaW5saW5lIHY4OjpIYW5kbGU8djg6Ok9iamVj dD4gdG9WOChQYXNzUmVmUHRyPFQ+IG9iamVjdCwgdjg6OkxvY2FsPHY4OjpPYmplY3Q+IGhvbGRl ciwgSW5kZXBlbmRlbnRNb2RlIGluZGVwZW5kZW50ID0gRG9Ob3RNYXJrSW5kZXBlbmRlbnQpCi0g ICAgewotICAgICAgICB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0PiBoYW5kbGUgPSB2ODo6UGVy c2lzdGVudDx2ODo6T2JqZWN0Pjo6TmV3KGhvbGRlcik7Ci0gICAgICAgIGlmIChpbmRlcGVuZGVu dCA9PSBNYXJrSW5kZXBlbmRlbnQpCi0gICAgICAgICAgICBoYW5kbGUuTWFya0luZGVwZW5kZW50 KCk7Ci0gICAgICAgIFY4RE9NV3JhcHBlcjo6c2V0SlNXcmFwcGVyRm9yRE9NT2JqZWN0KG9iamVj dCwgaGFuZGxlKTsKLSAgICAgICAgcmV0dXJuIGhvbGRlcjsKLSAgICB9Ci0KIH0KIAogI2VuZGlm IC8vIFY4UHJveHlfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4QXJyYXlCdWZmZXJDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4QXJyYXlCdWZmZXJDdXN0b20uY3BwCmluZGV4IDM2ZGVlMTViMDY3NDhlZjM2YTlm ZWI4ZjI1MmVhYjM5OTk0NzMwZmQuLmNmNjkwZmQyYmNhZTFkZWNlOGFlYTQxZDY3ZWE3N2UwNjMz MzYyZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEFy cmF5QnVmZmVyQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhBcnJheUJ1ZmZlckN1c3RvbS5jcHAKQEAgLTczLDcgKzczLDggQEAgdjg6OkhhbmRsZTx2 ODo6VmFsdWU+IFY4QXJyYXlCdWZmZXI6OmNvbnN0cnVjdG9yQ2FsbGJhY2soY29uc3Qgdjg6OkFy Z3VtZW50cyYgYXIKICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoIkFycmF5QnVmZmVyIHNpemUg aXMgbm90IGEgc21hbGwgZW5vdWdoIHBvc2l0aXZlIGludGVnZXIuIiwgVjhQcm94eTo6UmFuZ2VF cnJvcik7CiAgICAgLy8gVHJhbnNmb3JtIHRoZSBob2xkZXIgaW50byBhIHdyYXBwZXIgb2JqZWN0 IGZvciB0aGUgYXJyYXkuCiAgICAgVjhET01XcmFwcGVyOjpzZXRET01XcmFwcGVyKGFyZ3MuSG9s ZGVyKCksICZpbmZvLCBidWZmZXIuZ2V0KCkpOwotICAgIHJldHVybiB0b1Y4KGJ1ZmZlci5yZWxl YXNlKCksIGFyZ3MuSG9sZGVyKCkpOworICAgIFY4RE9NV3JhcHBlcjo6c2V0SlNXcmFwcGVyRm9y RE9NT2JqZWN0KGJ1ZmZlci5yZWxlYXNlKCksIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+OjpO ZXcoYXJncy5Ib2xkZXIoKSkpOworICAgIHJldHVybiBhcmdzLkhvbGRlcigpOwogfQogCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhBcnJheUJ1ZmZlclZpZXdDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCmluZGV4IDkxNTM3N2M1MmZi ODVhOWY3MjgzMzk3MjZkN2NiYzYzZjZmZTI4NWYuLmVmZWRkM2I3MzQzMzhhYzY5ZjIwODU3ZTMz OWRhZDZhYThkZmQ4ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCkBAIC04OCw3ICs4OCwxMCBA QCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gY29uc3RydWN0V2ViR0xBcnJheVdpdGhBcnJheUJ1ZmZl ckFyZ3VtZW50KGNvbnN0IHY4OjpBcmd1bQogICAgIFY4RE9NV3JhcHBlcjo6c2V0RE9NV3JhcHBl cihhcmdzLkhvbGRlcigpLCB0eXBlLCBhcnJheS5nZXQoKSk7CiAgICAgaWYgKGhhc0luZGV4ZXIp CiAgICAgICAgIGFyZ3MuSG9sZGVyKCktPlNldEluZGV4ZWRQcm9wZXJ0aWVzVG9FeHRlcm5hbEFy cmF5RGF0YShhcnJheS5nZXQoKS0+YmFzZUFkZHJlc3MoKSwgYXJyYXlUeXBlLCBhcnJheS5nZXQo KS0+bGVuZ3RoKCkpOwotICAgIHJldHVybiB0b1Y4KGFycmF5LnJlbGVhc2UoKSwgYXJncy5Ib2xk ZXIoKSwgTWFya0luZGVwZW5kZW50KTsKKyAgICB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0PiB3 cmFwcGVyID0gdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46Ok5ldyhhcmdzLkhvbGRlcigpKTsK KyAgICB3cmFwcGVyLk1hcmtJbmRlcGVuZGVudCgpOworICAgIFY4RE9NV3JhcHBlcjo6c2V0SlNX cmFwcGVyRm9yRE9NT2JqZWN0KGFycmF5LnJlbGVhc2UoKSwgd3JhcHBlcik7CisgICAgcmV0dXJu IGFyZ3MuSG9sZGVyKCk7CiB9CiAKIC8vIFRlbXBsYXRlIGZ1bmN0aW9uIHVzZWQgYnkgdGhlIEFy cmF5QnVmZmVyVmlldypDb25zdHJ1Y3RvciBjYWxsYmFja3MuCkBAIC0xMTcsNyArMTIwLDEwIEBA IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBjb25zdHJ1Y3RXZWJHTEFycmF5KGNvbnN0IHY4OjpBcmd1 bWVudHMmIGFyZ3MsIFdyYXBwZXJUeXBlCiAgICAgICAgIC8vIERvIG5vdCBjYWxsIFNldEluZGV4 ZWRQcm9wZXJ0aWVzVG9FeHRlcm5hbEFycmF5RGF0YSBvbiB0aGlzCiAgICAgICAgIC8vIG9iamVj dC4gTm90IG9ubHkgaXMgdGhlcmUgbm8gcG9pbnQgZnJvbSBhIHBlcmZvcm1hbmNlCiAgICAgICAg IC8vIHBlcnNwZWN0aXZlLCBidXQgZG9pbmcgc28gY2F1c2VzIGVycm9ycyBpbiB0aGUgc3Vic2V0 KCkgY2FzZS4KLSAgICAgICAgcmV0dXJuIHRvVjgoYXJyYXkucmVsZWFzZSgpLCBhcmdzLkhvbGRl cigpLCBNYXJrSW5kZXBlbmRlbnQpOworICAgICAgICB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0 PiB3cmFwcGVyID0gdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46Ok5ldyhhcmdzLkhvbGRlcigp KTsKKyAgICAgICAgd3JhcHBlci5NYXJrSW5kZXBlbmRlbnQoKTsKKyAgICAgICAgVjhET01XcmFw cGVyOjpzZXRKU1dyYXBwZXJGb3JET01PYmplY3QoYXJyYXkucmVsZWFzZSgpLCB3cmFwcGVyKTsK KyAgICAgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CiAgICAgfQogCiAgICAgLy8gU3VwcG9ydGVk IGNvbnN0cnVjdG9yczoKQEAgLTE3Myw3ICsxNzksMTAgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+ IGNvbnN0cnVjdFdlYkdMQXJyYXkoY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncywgV3JhcHBlclR5 cGUKICAgICBpZiAoIXNyY0FycmF5LklzRW1wdHkoKSkKICAgICAgICAgY29weUVsZW1lbnRzKGFy Z3MuSG9sZGVyKCksIHNyY0FycmF5LCAwKTsKIAotICAgIHJldHVybiB0b1Y4KGFycmF5LnJlbGVh c2UoKSwgYXJncy5Ib2xkZXIoKSwgTWFya0luZGVwZW5kZW50KTsKKyAgICB2ODo6UGVyc2lzdGVu dDx2ODo6T2JqZWN0PiB3cmFwcGVyID0gdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46Ok5ldyhh cmdzLkhvbGRlcigpKTsKKyAgICB3cmFwcGVyLk1hcmtJbmRlcGVuZGVudCgpOworICAgIFY4RE9N V3JhcHBlcjo6c2V0SlNXcmFwcGVyRm9yRE9NT2JqZWN0KGFycmF5LnJlbGVhc2UoKSwgd3JhcHBl cik7CisgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CiB9CiAKIHRlbXBsYXRlIDxjbGFzcyBDUGx1 c1BsdXNBcnJheVR5cGUsIGNsYXNzIEphdmFTY3JpcHRXcmFwcGVyQXJyYXlUeXBlPgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NRm9ybURhdGFDdXN0 b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NRm9ybURhdGFD dXN0b20uY3BwCmluZGV4IGUzNGVhNmZhOGQxMGFkYzZhNWUwY2FmMTgyNzVjYzAxNjFkNDY1MDIu LmE4ZDA3N2RjNWQ1OTdiMzQ4NmMzMmU5Mzc5YmI2YTU0ZjhlZjhjN2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTUZvcm1EYXRhQ3VzdG9tLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhET01Gb3JtRGF0YUN1c3Rv bS5jcHAKQEAgLTU2LDcgKzU2LDggQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RE9NRm9ybURh dGE6OmNvbnN0cnVjdG9yQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXIKICAgICBSZWZQ dHI8RE9NRm9ybURhdGE+IGRvbUZvcm1EYXRhID0gRE9NRm9ybURhdGE6OmNyZWF0ZShmb3JtKTsK IAogICAgIFY4RE9NV3JhcHBlcjo6c2V0RE9NV3JhcHBlcihhcmdzLkhvbGRlcigpLCAmaW5mbywg ZG9tRm9ybURhdGEuZ2V0KCkpOwotICAgIHJldHVybiB0b1Y4KGRvbUZvcm1EYXRhLnJlbGVhc2Uo KSwgYXJncy5Ib2xkZXIoKSk7CisgICAgVjhET01XcmFwcGVyOjpzZXRKU1dyYXBwZXJGb3JET01P YmplY3QoZG9tRm9ybURhdGEucmVsZWFzZSgpLCB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0Pjo6 TmV3KGFyZ3MuSG9sZGVyKCkpKTsKKyAgICByZXR1cm4gYXJncy5Ib2xkZXIoKTsKIH0KIAogdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IFY4RE9NRm9ybURhdGE6OmFwcGVuZENhbGxiYWNrKGNvbnN0IHY4 OjpBcmd1bWVudHMmIGFyZ3MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhEYXRhVmlld0N1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhEYXRhVmlld0N1c3RvbS5jcHAKaW5kZXggYjVmODAyMjU3N2Q2MTgyYmQ5Y2Yx OGM1NTE5NmY5YjY5OGI0NGNjOS4uMDI2ZjkyNDBjZTQyNGRlNzYwZWNmOTAyNjhjYjg2MzFjODhi ZDI0ZiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0 YVZpZXdDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OERhdGFWaWV3Q3VzdG9tLmNwcApAQCAtNDksNyArNDksOCBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gVjhEYXRhVmlldzo6Y29uc3RydWN0b3JDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBh cmdzKQogICAgICAgICAvLyAnbmV3IERhdGFWaWV3KCknIGFuZCB0aGUgY2FsbCB1c2VkIHRvIGNv bnN0cnVjdCB0aGUgY2FjaGVkIERhdGFWaWV3IG9iamVjdC4KICAgICAgICAgUmVmUHRyPERhdGFW aWV3PiBkYXRhVmlldyA9IERhdGFWaWV3OjpjcmVhdGUoMCk7CiAgICAgICAgIFY4RE9NV3JhcHBl cjo6c2V0RE9NV3JhcHBlcihhcmdzLkhvbGRlcigpLCAmaW5mbywgZGF0YVZpZXcuZ2V0KCkpOwot ICAgICAgICByZXR1cm4gdG9WOChkYXRhVmlldy5yZWxlYXNlKCksIGFyZ3MuSG9sZGVyKCkpOwor ICAgICAgICBWOERPTVdyYXBwZXI6OnNldEpTV3JhcHBlckZvckRPTU9iamVjdChkYXRhVmlldy5y ZWxlYXNlKCksIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+OjpOZXcoYXJncy5Ib2xkZXIoKSkp OworICAgICAgICByZXR1cm4gYXJncy5Ib2xkZXIoKTsKICAgICB9CiAgICAgaWYgKGFyZ3NbMF0t PklzTnVsbCgpIHx8ICFWOEFycmF5QnVmZmVyOjpIYXNJbnN0YW5jZShhcmdzWzBdKSkKICAgICAg ICAgcmV0dXJuIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlQ2hhbm5lbENvbnN0cnVjdG9yLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VDaGFubmVsQ29u c3RydWN0b3IuY3BwCmluZGV4IDZmZGE4MzE5MjYzZDIxNzU4MmUzNzc1MTQ3N2VlMGYxYjk4ZjU5 MTAuLmE0ZDI1M2I1ZDZhNTc4NWZiMmM4YzMxMjYyOTRjMDllY2E1ZTFiYmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VDaGFubmVsQ29uc3Ry dWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3Nh Z2VDaGFubmVsQ29uc3RydWN0b3IuY3BwCkBAIC03NSw3ICs3NSw4IEBAIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiBWOE1lc3NhZ2VDaGFubmVsOjpjb25zdHJ1Y3RvckNhbGxiYWNrKGNvbnN0IHY4OjpB cmd1bWVudHMmCiAKICAgICAvLyBTZXR1cCB0aGUgc3RhbmRhcmQgd3JhcHBlciBvYmplY3QgaW50 ZXJuYWwgZmllbGRzLgogICAgIFY4RE9NV3JhcHBlcjo6c2V0RE9NV3JhcHBlcihtZXNzYWdlQ2hh bm5lbCwgJmluZm8sIG9iai5nZXQoKSk7Ci0gICAgcmV0dXJuIHRvVjgob2JqLnJlbGVhc2UoKSwg bWVzc2FnZUNoYW5uZWwpOworICAgIFY4RE9NV3JhcHBlcjo6c2V0SlNXcmFwcGVyRm9yRE9NT2Jq ZWN0KG9iai5yZWxlYXNlKCksIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+OjpOZXcobWVzc2Fn ZUNoYW5uZWwpKTsKKyAgICByZXR1cm4gbWVzc2FnZUNoYW5uZWw7CiB9CiAKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4V2ViS2l0UG9pbnRDb25zdHJ1 Y3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhXZWJLaXRQb2lu dENvbnN0cnVjdG9yLmNwcAppbmRleCA2OWQ4YjJhNTczYzM4NWY1YTk5NjE4NDM1MDgxNTJkOGIw MjQxMmJjLi45YTgzYmI4ZDViZTAxZmRhOTU0NDNiOWQ5N2I4ZDhkYWNhYmJjNGM4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhXZWJLaXRQb2ludENvbnN0 cnVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhXZWJL aXRQb2ludENvbnN0cnVjdG9yLmNwcApAQCAtNjYsNyArNjYsOCBAQCB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gVjhXZWJLaXRQb2ludDo6Y29uc3RydWN0b3JDYWxsYmFjayhjb25zdCB2ODo6QXJndW1l bnRzJiBhcgogICAgIH0KICAgICBSZWZQdHI8V2ViS2l0UG9pbnQ+IHBvaW50ID0gV2ViS2l0UG9p bnQ6OmNyZWF0ZSh4LCB5KTsKICAgICBWOERPTVdyYXBwZXI6OnNldERPTVdyYXBwZXIoYXJncy5I b2xkZXIoKSwgJmluZm8sIHBvaW50LmdldCgpKTsKLSAgICByZXR1cm4gdG9WOChwb2ludC5yZWxl YXNlKCksIGFyZ3MuSG9sZGVyKCkpOworICAgIFY4RE9NV3JhcHBlcjo6c2V0SlNXcmFwcGVyRm9y RE9NT2JqZWN0KHBvaW50LnJlbGVhc2UoKSwgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46Ok5l dyhhcmdzLkhvbGRlcigpKSk7CisgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CiB9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUK