84637 2012-04-23 14:46:41 -0700 [V8][Refactoring] throwTypeError() should take one string argument that explains what the type error is 2012-04-24 10:05:26 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 84074 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 608034 0 haraken 2012-04-23 14:46:41 -0700 Current behavior: - throwError("foo", V8Proxy::TypeError) is equivalent to throwError("foo") - throwTypeError() is equivalent to throwError("Type Error") We want to unify them as follows: (1) throwTypeError() should take one string argument which explains what the type error is. Just "Type Error" is not descriptive. (2) Replace all throwError("foo") with throwTypeError("foo"). (3) Replace all throwError("foo", V8Proxy::TypeError) with throwTypeError("foo"). Consequently, only throwTypeError("...") will remain in the binding code. In this bug, we fix (1). 608121 1 138443 haraken 2012-04-23 15:47:19 -0700 Created attachment 138443 Patch 608794 2 haraken 2012-04-24 10:05:26 -0700 We need to fix JSC side too to align the behavior, and thus the fix would be controversial. Let me mark as WONTFIX for now. 138443 2012-04-23 15:47:19 -0700 2012-04-24 10:04:32 -0700 Patch bug-84637-20120423154718.patch text/plain 15131 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0OTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRhZDllZTY3MmVjNjRj MTMzYzJlOGQ2Mzk2M2M0NzE2YTU5NTUzNy4uMjg5MGUyMDdlMWJjMDllODU3NDA1NzlmMjZhNTVi MDMxMjM2MzdiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU3IEBACisyMDEyLTA0LTIzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdW1JlZmFjdG9y aW5nXSB0aHJvd1R5cGVFcnJvcigpIHNob3VsZCB0YWtlIG9uZSBzdHJpbmcKKyAgICAgICAgYXJn dW1lbnQgdGhhdCBleHBsYWlucyB3aGF0IHRoZSB0eXBlIGVycm9yIGlzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDYzNworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnQgYmVoYXZpb3I6CisgICAg ICAgIC0gdGhyb3dFcnJvcigiZm9vIiwgVjhQcm94eTo6VHlwZUVycm9yKSBpcyBlcXVpdmFsZW50 IHRvIHRocm93RXJyb3IoImZvbyIpCisgICAgICAgIC0gdGhyb3dUeXBlRXJyb3IoKSBpcyBlcXVp dmFsZW50IHRvIHRocm93RXJyb3IoIlR5cGUgRXJyb3IiKQorCisgICAgICAgIFdlIHdhbnQgdG8g dW5pZnkgdGhlbSBhcyBmb2xsb3dzOgorCisgICAgICAgICgxKSB0aHJvd1R5cGVFcnJvcigpIHNo b3VsZCB0YWtlIG9uZSBzdHJpbmcgYXJndW1lbnQgd2hpY2gKKyAgICAgICAgZXhwbGFpbnMgd2hh dCB0aGUgdHlwZSBlcnJvciBpcy4gSnVzdCAiVHlwZSBFcnJvciIgaXMgbm90IGRlc2NyaXB0aXZl LgorICAgICAgICAoMikgUmVwbGFjZSBhbGwgdGhyb3dFcnJvcigiZm9vIikgd2l0aCB0aHJvd1R5 cGVFcnJvcigiZm9vIikuCisgICAgICAgICgzKSBSZXBsYWNlIGFsbCB0aHJvd0Vycm9yKCJmb28i LCBWOFByb3h5OjpUeXBlRXJyb3IpIHdpdGgKKyAgICAgICAgdGhyb3dUeXBlRXJyb3IoImZvbyIp LgorCisgICAgICAgIENvbnNlcXVlbnRseSwgb25seSB0aHJvd1R5cGVFcnJvcigiLi4uIikgd2ls bCByZW1haW4gaW4gdGhlIGJpbmRpbmcgY29kZS4KKworICAgICAgICBUaGlzIHBhdGNoIGZpeGVz ICgxKS4KKworICAgICAgICBUZXN0czogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRs CisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFByb3h5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlY4UHJveHk6OnRocm93VHlwZUVycm9yKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFByb3h5 Lmg6CisgICAgICAgIChWOFByb3h5KToKKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29k ZUdlbmVyYXRvclY4LnBtOgorICAgICAgICAoR2VuZXJhdGVOb3JtYWxBdHRyU2V0dGVyKToKKyAg ICAgICAgKEdlbmVyYXRlT3ZlcmxvYWRlZEZ1bmN0aW9uQ2FsbGJhY2spOgorICAgICAgICAoR2Vu ZXJhdGVQYXJhbWV0ZXJzQ2hlY2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEFy cmF5QnVmZmVyVmlld0N1c3RvbS5oOgorICAgICAgICAoV2ViQ29yZTo6Y29uc3RydWN0V2ViR0xB cnJheSk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YVZpZXdDdXN0b20uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6VjhEYXRhVmlldzo6Y29uc3RydWN0b3JDYWxsYmFjayk6Cisg ICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4U1ZHTGVuZ3RoQ3VzdG9tLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlY4U1ZHTGVuZ3RoOjp2YWx1ZUFjY2Vzc29yU2V0dGVyKToKKyAgICAgICAg KiBiaW5kaW5ncy92OC9jdXN0b20vVjhXZWJHTFJlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6VjhXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmdldEF0dGFjaGVkU2hh ZGVyc0NhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OlY4V2ViR0xSZW5kZXJpbmdDb250ZXh0 OjpnZXRQcm9ncmFtUGFyYW1ldGVyQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6VjhXZWJH TFJlbmRlcmluZ0NvbnRleHQ6OmdldFNoYWRlclBhcmFtZXRlckNhbGxiYWNrKToKKyAgICAgICAg KFdlYkNvcmU6OlY4V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpnZXRVbmlmb3JtQ2FsbGJhY2spOgor ICAgICAgICAoV2ViQ29yZTo6dmVydGV4QXR0cmliQW5kVW5pZm9ybUhlbHBlcmYpOgorICAgICAg ICAoV2ViQ29yZTo6dW5pZm9ybUhlbHBlcmkpOgorICAgICAgICAoV2ViQ29yZTo6dW5pZm9ybU1h dHJpeEhlbHBlcik6CisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0 T2JqLmNwcDogVXBkYXRlZCBydW4tYmluZGluZ3MtdGVzdHMgcmVzdWx0cworICAgICAgICAoV2Vi Q29yZTo6VGVzdE9ialY4SW50ZXJuYWw6Om92ZXJsb2FkZWRNZXRob2RDYWxsYmFjayk6CisgICAg ICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJbnRlcm5hbDo6b3ZlcmxvYWRlZE1ldGhvZDFDYWxsYmFj ayk6CisKIDIwMTItMDQtMjMgIEVtaWwgQSBFa2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIENyYXNoIGluIFJlbmRlcklubGluZTo6Y2xpcHBlZE92ZXJmbG93UmVjdEZvclJlcGFp bnQgZm9yIFByaW50UHJldmlldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL0NvZGVHZW5lcmF0b3JWOC5wbQppbmRleCA5MmYzMzYxYjhmODQ1YjEyZDdmM2FjOWRlNzU2 YzcwMTQ1ZmI0OGUxLi45NjgzYzMwMmZkZDQ1MGQxODZlNTkwZWVjNzFhZTllMTMzOWYyNjU5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JW OC5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JW OC5wbQpAQCAtMTA0NSw3ICsxMDQ1LDcgQEAgc3ViIEdlbmVyYXRlTm9ybWFsQXR0clNldHRlcgog ICAgICAgICBteSAkYXJnVHlwZSA9IEdldFR5cGVGcm9tU2lnbmF0dXJlKCRhdHRyaWJ1dGUtPnNp Z25hdHVyZSk7CiAgICAgICAgIGlmIChJc1dyYXBwZXJUeXBlKCRhcmdUeXBlKSkgewogICAgICAg ICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICBpZiAoIWlzVW5kZWZpbmVkT3JOdWxs KHZhbHVlKSAmJiAhVjgke2FyZ1R5cGV9OjpIYXNJbnN0YW5jZSh2YWx1ZSkpIHtcbiIpOwotICAg ICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICAgICAgVjhQcm94eTo6dGhyb3dU eXBlRXJyb3IoKTtcbiIpOworICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAg ICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoXCJJbnZhbGlkIHZhbHVlIHR5cGVcIik7XG4i KTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgICAgIHJldHVybjtc biIpOwogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICB9XG4iKTsKICAg ICAgICAgfQpAQCAtMTM0NSw3ICsxMzQ1LDcgQEAgRU5ECiAgICAgICAgIHB1c2goQGltcGxDb250 ZW50RGVjbHMsICIgICAgICAgIHJldHVybiAke25hbWV9JG92ZXJsb2FkLT57b3ZlcmxvYWRJbmRl eH1DYWxsYmFjayhhcmdzKTtcbiIpOwogICAgIH0KICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xz LCA8PEVORCk7Ci0gICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAgICBWOFByb3h5Ojp0 aHJvd1R5cGVFcnJvcigiQXJndW1lbnRzIGRvIG5vdCBtYXRjaCBhbnkgbWV0aG9kIHNpZ25hdHVy ZSIpOwogICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigpOwogRU5ECiAgICAgcHVz aChAaW1wbENvbnRlbnREZWNscywgIn1cblxuIik7CkBAIC0xNjU3LDcgKzE2NTcsNyBAQCBzdWIg R2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2sKICAgICAgICAgICAgICAgICBteSAkYXJnVHlwZSA9IEdl dFR5cGVGcm9tU2lnbmF0dXJlKCRwYXJhbWV0ZXIpOwogICAgICAgICAgICAgICAgIGlmIChJc1dy YXBwZXJUeXBlKCRhcmdUeXBlKSkgewogICAgICAgICAgICAgICAgICAgICAkcGFyYW1ldGVyQ2hl Y2tTdHJpbmcgLj0gIiAgICBpZiAoYXJncy5MZW5ndGgoKSA+ICRwYXJhbUluZGV4ICYmICFpc1Vu ZGVmaW5lZE9yTnVsbCgkYXJnVmFsdWUpICYmICFWOCR7YXJnVHlwZX06Okhhc0luc3RhbmNlKCRh cmdWYWx1ZSkpIHtcbiI7Ci0gICAgICAgICAgICAgICAgICAgICRwYXJhbWV0ZXJDaGVja1N0cmlu ZyAuPSAiICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpO1xuIjsKKyAgICAgICAgICAg ICAgICAgICAgJHBhcmFtZXRlckNoZWNrU3RyaW5nIC49ICIgICAgICAgIFY4UHJveHk6OnRocm93 VHlwZUVycm9yKFwiSW52YWxpZCB2YWx1ZSB0eXBlXCIpO1xuIjsKICAgICAgICAgICAgICAgICAg ICAgJHBhcmFtZXRlckNoZWNrU3RyaW5nIC49ICIgICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJ bnRlcmNlcHRvcigpO1xuIjsKICAgICAgICAgICAgICAgICAgICAgJHBhcmFtZXRlckNoZWNrU3Ry aW5nIC49ICIgICAgfVxuIjsKICAgICAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCmluZGV4IGZhM2Nh ZWU4ZGU1NTA1MDI2MzIzNjA0NzAxMTA5MDZiNzVlYWRhYTIuLmRiZjVmZDQ0MjE1NGRiNDVhYmQ4 MzY4NTkzZjIxMmQwMzVkZDBkMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCkBAIC0xNzk1LDcgKzE3OTUsNyBAQCBz dGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IG92ZXJsb2FkZWRNZXRob2RDYWxsYmFjayhjb25z dCB2ODo6QXJndW1lbnRzJiBhcmdzKQogICAgICAgICByZXR1cm4gb3ZlcmxvYWRlZE1ldGhvZDZD YWxsYmFjayhhcmdzKTsKICAgICBpZiAoKGFyZ3MuTGVuZ3RoKCkgPT0gMSAmJiAoYXJnc1swXS0+ SXNOdWxsKCkgfHwgYXJnc1swXS0+SXNBcnJheSgpKSkpCiAgICAgICAgIHJldHVybiBvdmVybG9h ZGVkTWV0aG9kN0NhbGxiYWNrKGFyZ3MpOwotICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCk7 CisgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoIkFyZ3VtZW50cyBkbyBub3QgbWF0Y2ggYW55 IG1ldGhvZCBzaWduYXR1cmUiKTsKICAgICByZXR1cm4gbm90SGFuZGxlZEJ5SW50ZXJjZXB0b3Io KTsKIH0KIApAQCAtMTg1Myw3ICsxODUzLDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBvdmVybG9hZGVkTWV0aG9kMUNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MKICAg ICAgICAgcmV0dXJuIG92ZXJsb2FkZWRNZXRob2QxMUNhbGxiYWNrKGFyZ3MpOwogICAgIGlmICgo YXJncy5MZW5ndGgoKSA9PSAxICYmIChhcmdzWzBdLT5Jc051bGwoKSB8fCBhcmdzWzBdLT5Jc1Vu ZGVmaW5lZCgpIHx8IGFyZ3NbMF0tPklzU3RyaW5nKCkgfHwgYXJnc1swXS0+SXNPYmplY3QoKSkp KQogICAgICAgICByZXR1cm4gb3ZlcmxvYWRlZE1ldGhvZDEyQ2FsbGJhY2soYXJncyk7Ci0gICAg VjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigi QXJndW1lbnRzIGRvIG5vdCBtYXRjaCBhbnkgbWV0aG9kIHNpZ25hdHVyZSIpOwogICAgIHJldHVy biBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4UHJveHkuY3BwCmluZGV4IDgyZDc0MGFhMTk1ZjgwN2JmMmQ2MTNmNjBiZGUzNTIyNzBmYTcz ODMuLjQyYjRhMzE4NTcwODI3ZTA4NjZmNWM1ZTNhMDVhMzg4MDkzOGYyMTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCkBAIC01ODIsOSArNTgyLDkgQEAgdjg6OkhhbmRs ZTx2ODo6VmFsdWU+IFY4UHJveHk6OnRocm93RXJyb3IoRXJyb3JUeXBlIHR5cGUsIGNvbnN0IGNo YXIqIG1lc3NhZ2UsIHYKICAgICB9CiB9CiAKLXY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFByb3h5 Ojp0aHJvd1R5cGVFcnJvcigpCit2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhQcm94eTo6dGhyb3dU eXBlRXJyb3IoY29uc3QgY2hhciogbWVzc2FnZSkKIHsKLSAgICByZXR1cm4gdGhyb3dFcnJvcihU eXBlRXJyb3IsICJUeXBlIGVycm9yIik7CisgICAgcmV0dXJuIHRocm93RXJyb3IoVHlwZUVycm9y LCBtZXNzYWdlKTsKIH0KIAogdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4UHJveHk6OnRocm93U3lu dGF4RXJyb3IoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94 eS5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCmluZGV4IDRmNTQyYjM5 MWIyNDMyMmEzMWJiOTU4ODllNDM0MzhkOTNmNTQ3YzAuLjIyMzVhZjBmYzY5Njc2YjZkNjA4MmY5 YzgwMDA5YzRjYTE3NTYzM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKQEAg LTI0MSw3ICsyNDEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHN0YXRpYyB2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4gdGhyb3dFcnJvcihFcnJvclR5cGUsIGNvbnN0IGNoYXIqIG1lc3Nh Z2UsIHY4OjpJc29sYXRlKiA9IDApOwogCiAgICAgICAgIC8vIEhlbHBlcnMgZm9yIHRocm93aW5n IHN5bnRheCBhbmQgdHlwZSBlcnJvcnMgd2l0aCBwcmVkZWZpbmVkIG1lc3NhZ2VzLgotICAgICAg ICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHRocm93VHlwZUVycm9yKCk7CisgICAgICAg IHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdGhyb3dUeXBlRXJyb3IoY29uc3QgY2hhciog bWVzc2FnZSk7CiAgICAgICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdGhyb3dTeW50 YXhFcnJvcigpOwogCiAgICAgICAgIHY4OjpMb2NhbDx2ODo6Q29udGV4dD4gY29udGV4dCgpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4QXJyYXlCdWZm ZXJWaWV3Q3VzdG9tLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBcnJh eUJ1ZmZlclZpZXdDdXN0b20uaAppbmRleCBlZmVkZDNiNzM0MzM4YWM2OWYyMDg1N2UzMzlkYWQ2 YWE4ZGZkOGU1Li5jOTE4NWQ5YzlmNTFjYmFhZGEzYzllNzI1NGIxZDlhMTYyYjdlYzgzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBcnJheUJ1ZmZlclZp ZXdDdXN0b20uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBcnJh eUJ1ZmZlclZpZXdDdXN0b20uaApAQCAtMTM2LDExICsxMzYsOCBAQCB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gY29uc3RydWN0V2ViR0xBcnJheShjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzLCBXcmFw cGVyVHlwZQogICAgIC8vICAgICAgImJ1ZiIsIHN0YXJ0aW5nIGF0IHRoZSBzcGVjaWZpZWQgb2Zm c2V0LCBmb3IgdGhlIGdpdmVuCiAgICAgLy8gICAgICBsZW5ndGgKIAotICAgIGlmIChhcmdzWzBd LT5Jc051bGwoKSkgewotICAgICAgICAvLyBJbnZhbGlkIGZpcnN0IGFyZ3VtZW50Ci0gICAgICAg IC8vIEZJWE1FOiB1c2UgZm9ydGhjb21pbmcgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKS4KLSAg ICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93RXJyb3IoVjhQcm94eTo6VHlwZUVycm9yLCAiVHlw ZSBlcnJvciIpOwotICAgIH0KKyAgICBpZiAoYXJnc1swXS0+SXNOdWxsKCkpCisgICAgICAgIHJl dHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigiSW52YWxpZCB2YWx1ZSB0eXBlIik7CiAKICAg ICAvLyBTZWUgd2hldGhlciB0aGUgZmlyc3QgYXJndW1lbnQgaXMgYSBBcnJheUJ1ZmZlci4KICAg ICBpZiAoVjhBcnJheUJ1ZmZlcjo6SGFzSW5zdGFuY2UoYXJnc1swXSkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEYXRhVmlld0N1c3RvbS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEYXRhVmlld0N1c3RvbS5jcHAKaW5k ZXggMDI2ZjkyNDBjZTQyNGRlNzYwZWNmOTAyNjhjYjg2MzFjODhiZDI0Zi4uMjJiZDZjMzM1Zjli ODY1OTlkMGMzNTAxZmVhOTlhN2VhMzc5NTdhYSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YVZpZXdDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERhdGFWaWV3Q3VzdG9tLmNwcApAQCAtNTMsNyArNTMs NyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhEYXRhVmlldzo6Y29uc3RydWN0b3JDYWxsYmFj ayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogICAgICAgICByZXR1cm4gYXJncy5Ib2xkZXIo KTsKICAgICB9CiAgICAgaWYgKGFyZ3NbMF0tPklzTnVsbCgpIHx8ICFWOEFycmF5QnVmZmVyOjpI YXNJbnN0YW5jZShhcmdzWzBdKSkKLSAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93VHlwZUVy cm9yKCk7CisgICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigiSW52YWxpZCB2 YWx1ZSB0eXBlIik7CiAgICAgcmV0dXJuIGNvbnN0cnVjdFdlYkdMQXJyYXlXaXRoQXJyYXlCdWZm ZXJBcmd1bWVudDxEYXRhVmlldywgY2hhcj4oYXJncywgJmluZm8sIHY4OjprRXh0ZXJuYWxCeXRl QXJyYXksIGZhbHNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvY3VzdG9tL1Y4U1ZHTGVuZ3RoQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOFNWR0xlbmd0aEN1c3RvbS5jcHAKaW5kZXggYTI2MzA1YTUzMDhmZTUwYmU3 YmNlYmRmNzRjYmQwNjBlZTExMzUyMi4uNGY1YzQ0MzFiY2U2NWZhYmVlOTQ0ZjgyNjgxNjM4OTlj MWMxM2IzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4 U1ZHTGVuZ3RoQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhTVkdMZW5ndGhDdXN0b20uY3BwCkBAIC02Niw3ICs2Niw3IEBAIHZvaWQgVjhTVkdMZW5n dGg6OnZhbHVlQWNjZXNzb3JTZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIHY4OjpM b2NhbDx2ODo6CiAgICAgfQogCiAgICAgaWYgKCFpc1VuZGVmaW5lZE9yTnVsbCh2YWx1ZSkgJiYg IXZhbHVlLT5Jc051bWJlcigpICYmICF2YWx1ZS0+SXNCb29sZWFuKCkpIHsKLSAgICAgICAgVjhQ cm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3Io IkludmFsaWQgdmFsdWUgdHlwZSIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhXZWJHTFJlbmRlcmluZ0Nv bnRleHRDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4V2Vi R0xSZW5kZXJpbmdDb250ZXh0Q3VzdG9tLmNwcAppbmRleCA3ZGNlZGJlMjU0NzViMjMwNjFmOTZi MGQxYTg2NGQ2Zjg5YTg5MjI1Li5lZGM4MzlkMjc1ZTg5MWM1ZDFjYjQzY2JhMWY0Mzg2ZWNhYmIy ZDI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhXZWJH TFJlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOFdlYkdMUmVuZGVyaW5nQ29udGV4dEN1c3RvbS5jcHAKQEAgLTI3OCw3ICsy NzgsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhXZWJHTFJlbmRlcmluZ0NvbnRleHQ6Omdl dEF0dGFjaGVkU2hhZGVyc0NhbGxiYWNrKGNvbnN0CiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7 CiAgICAgV2ViR0xSZW5kZXJpbmdDb250ZXh0KiBjb250ZXh0ID0gVjhXZWJHTFJlbmRlcmluZ0Nv bnRleHQ6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwogICAgIGlmIChhcmdzLkxlbmd0aCgpID4g MCAmJiAhaXNVbmRlZmluZWRPck51bGwoYXJnc1swXSkgJiYgIVY4V2ViR0xQcm9ncmFtOjpIYXNJ bnN0YW5jZShhcmdzWzBdKSkgewotICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOwor ICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigiSW52YWxpZCB2YWx1ZSB0eXBlIik7CiAg ICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigpOwogICAgIH0KICAgICBXZWJH TFByb2dyYW0qIHByb2dyYW0gPSBWOFdlYkdMUHJvZ3JhbTo6SGFzSW5zdGFuY2UoYXJnc1swXSkg PyBWOFdlYkdMUHJvZ3JhbTo6dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChh cmdzWzBdKSkgOiAwOwpAQCAtMzY5LDcgKzM2OSw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBW OFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0UHJvZ3JhbVBhcmFtZXRlckNhbGxiYWNrKGNvbnN0 CiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgV2ViR0xSZW5kZXJpbmdDb250ZXh0KiBj b250ZXh0ID0gVjhXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkp OwogICAgIGlmIChhcmdzLkxlbmd0aCgpID4gMCAmJiAhaXNVbmRlZmluZWRPck51bGwoYXJnc1sw XSkgJiYgIVY4V2ViR0xQcm9ncmFtOjpIYXNJbnN0YW5jZShhcmdzWzBdKSkgewotICAgICAgICBW OFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOworICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJv cigiSW52YWxpZCB2YWx1ZSB0eXBlIik7CiAgICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRl cmNlcHRvcigpOwogICAgIH0KICAgICBXZWJHTFByb2dyYW0qIHByb2dyYW0gPSBWOFdlYkdMUHJv Z3JhbTo6SGFzSW5zdGFuY2UoYXJnc1swXSkgPyBWOFdlYkdMUHJvZ3JhbTo6dG9OYXRpdmUodjg6 OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChhcmdzWzBdKSkgOiAwOwpAQCAtNDAwLDcgKzQwMCw3 IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0U2hh ZGVyUGFyYW1ldGVyQ2FsbGJhY2soY29uc3QKICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKICAg ICBXZWJHTFJlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQgPSBWOFdlYkdMUmVuZGVyaW5nQ29udGV4 dDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7CiAgICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPiAwICYm ICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAmJiAhVjhXZWJHTFNoYWRlcjo6SGFzSW5zdGFu Y2UoYXJnc1swXSkpIHsKLSAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAgICAg ICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoIkludmFsaWQgdmFsdWUgdHlwZSIpOwogICAgICAg ICByZXR1cm4gbm90SGFuZGxlZEJ5SW50ZXJjZXB0b3IoKTsKICAgICB9CiAgICAgV2ViR0xTaGFk ZXIqIHNoYWRlciA9IFY4V2ViR0xTaGFkZXI6Okhhc0luc3RhbmNlKGFyZ3NbMF0pID8gVjhXZWJH TFNoYWRlcjo6dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChhcmdzWzBdKSkg OiAwOwpAQCAtNDQ1LDEzICs0NDUsMTMgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4V2ViR0xS ZW5kZXJpbmdDb250ZXh0OjpnZXRVbmlmb3JtQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3UKICAgICBF eGNlcHRpb25Db2RlIGVjID0gMDsKICAgICBXZWJHTFJlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQg PSBWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7CiAgICAg aWYgKGFyZ3MuTGVuZ3RoKCkgPiAwICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAmJiAh VjhXZWJHTFByb2dyYW06Okhhc0luc3RhbmNlKGFyZ3NbMF0pKSB7Ci0gICAgICAgIFY4UHJveHk6 OnRocm93VHlwZUVycm9yKCk7CisgICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCJJbnZh bGlkIHZhbHVlIHR5cGUiKTsKICAgICAgICAgcmV0dXJuIG5vdEhhbmRsZWRCeUludGVyY2VwdG9y KCk7CiAgICAgfQogICAgIFdlYkdMUHJvZ3JhbSogcHJvZ3JhbSA9IFY4V2ViR0xQcm9ncmFtOjpI YXNJbnN0YW5jZShhcmdzWzBdKSA/IFY4V2ViR0xQcm9ncmFtOjp0b05hdGl2ZSh2ODo6SGFuZGxl PHY4OjpPYmplY3Q+OjpDYXN0KGFyZ3NbMF0pKSA6IDA7CiAKICAgICBpZiAoYXJncy5MZW5ndGgo KSA+IDEgJiYgIWlzVW5kZWZpbmVkT3JOdWxsKGFyZ3NbMV0pICYmICFWOFdlYkdMVW5pZm9ybUxv Y2F0aW9uOjpIYXNJbnN0YW5jZShhcmdzWzFdKSkgewotICAgICAgICBWOFByb3h5Ojp0aHJvd1R5 cGVFcnJvcigpOworICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigiSW52YWxpZCB2YWx1 ZSB0eXBlIik7CiAgICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigpOwogICAg IH0KICAgICBib29sIG9rID0gZmFsc2U7CkBAIC01MjMsNyArNTIzLDcgQEAgc3RhdGljIHY4OjpI YW5kbGU8djg6OlZhbHVlPiB2ZXJ0ZXhBdHRyaWJBbmRVbmlmb3JtSGVscGVyZihjb25zdCB2ODo6 QXJndW1lbnRzJgogICAgICAgICBpbmRleCA9IHRvSW50MzIoYXJnc1swXSk7CiAgICAgZWxzZSB7 CiAgICAgICAgIGlmIChhcmdzLkxlbmd0aCgpID4gMCAmJiAhaXNVbmRlZmluZWRPck51bGwoYXJn c1swXSkgJiYgIVY4V2ViR0xVbmlmb3JtTG9jYXRpb246Okhhc0luc3RhbmNlKGFyZ3NbMF0pKSB7 Ci0gICAgICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOworICAgICAgICAgICAgVjhQ cm94eTo6dGhyb3dUeXBlRXJyb3IoIkludmFsaWQgdmFsdWUgdHlwZSIpOwogICAgICAgICAgICAg cmV0dXJuIG5vdEhhbmRsZWRCeUludGVyY2VwdG9yKCk7CiAgICAgICAgIH0KICAgICAgICAgbG9j YXRpb24gPSB0b1dlYkdMVW5pZm9ybUxvY2F0aW9uKGFyZ3NbMF0sIG9rKTsKQEAgLTU1Miw3ICs1 NTIsNyBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZlcnRleEF0dHJpYkFuZFVuaWZv cm1IZWxwZXJmKGNvbnN0IHY4OjpBcmd1bWVudHMmCiAgICAgfQogCiAgICAgaWYgKGFyZ3NbMV0u SXNFbXB0eSgpIHx8ICFhcmdzWzFdLT5Jc0FycmF5KCkpIHsKLSAgICAgICAgVjhQcm94eTo6dGhy b3dUeXBlRXJyb3IoKTsKKyAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoIkludmFsaWQg dmFsdWUgdHlwZSIpOwogICAgICAgICByZXR1cm4gbm90SGFuZGxlZEJ5SW50ZXJjZXB0b3IoKTsK ICAgICB9CiAgICAgdjg6OkhhbmRsZTx2ODo6QXJyYXk+IGFycmF5ID0KQEAgLTYwMSw3ICs2MDEs NyBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHVuaWZvcm1IZWxwZXJpKGNvbnN0IHY4 OjpBcmd1bWVudHMmIGFyZ3MsCiAKICAgICBXZWJHTFJlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQg PSBWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7CiAgICAg aWYgKGFyZ3MuTGVuZ3RoKCkgPiAwICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAmJiAh VjhXZWJHTFVuaWZvcm1Mb2NhdGlvbjo6SGFzSW5zdGFuY2UoYXJnc1swXSkpIHsKLSAgICAgICAg VjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJy b3IoIkludmFsaWQgdmFsdWUgdHlwZSIpOwogICAgICAgICByZXR1cm4gbm90SGFuZGxlZEJ5SW50 ZXJjZXB0b3IoKTsKICAgICB9CiAgICAgYm9vbCBvayA9IGZhbHNlOwpAQCAtNjI0LDcgKzYyNCw3 IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdW5pZm9ybUhlbHBlcmkoY29uc3Qgdjg6 OkFyZ3VtZW50cyYgYXJncywKICAgICB9CiAKICAgICBpZiAoYXJnc1sxXS5Jc0VtcHR5KCkgfHwg IWFyZ3NbMV0tPklzQXJyYXkoKSkgewotICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigp OworICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigiSW52YWxpZCB2YWx1ZSB0eXBlIik7 CiAgICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigpOwogICAgIH0KICAgICB2 ODo6SGFuZGxlPHY4OjpBcnJheT4gYXJyYXkgPQpAQCAtNzE4LDcgKzcxOCw3IEBAIHN0YXRpYyB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdW5pZm9ybU1hdHJpeEhlbHBlcihjb25zdCB2ODo6QXJndW1l bnRzJiBhcmdzLAogICAgIFdlYkdMUmVuZGVyaW5nQ29udGV4dCogY29udGV4dCA9IFY4V2ViR0xS ZW5kZXJpbmdDb250ZXh0Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKIAogICAgIGlmIChhcmdz Lkxlbmd0aCgpID4gMCAmJiAhaXNVbmRlZmluZWRPck51bGwoYXJnc1swXSkgJiYgIVY4V2ViR0xV bmlmb3JtTG9jYXRpb246Okhhc0luc3RhbmNlKGFyZ3NbMF0pKSB7Ci0gICAgICAgIFY4UHJveHk6 OnRocm93VHlwZUVycm9yKCk7CisgICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCJJbnZh bGlkIHZhbHVlIHR5cGUiKTsKICAgICAgICAgcmV0dXJuIG5vdEhhbmRsZWRCeUludGVyY2VwdG9y KCk7CiAgICAgfQogICAgIGJvb2wgb2sgPSBmYWxzZTsKQEAgLTc0MSw3ICs3NDEsNyBAQCBzdGF0 aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHVuaWZvcm1NYXRyaXhIZWxwZXIoY29uc3Qgdjg6OkFy Z3VtZW50cyYgYXJncywKICAgICB9CiAKICAgICBpZiAoYXJnc1syXS5Jc0VtcHR5KCkgfHwgIWFy Z3NbMl0tPklzQXJyYXkoKSkgewotICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOwor ICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigiSW52YWxpZCB2YWx1ZSB0eXBlIik7CiAg ICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigpOwogICAgIH0KICAgICB2ODo6 SGFuZGxlPHY4OjpBcnJheT4gYXJyYXkgPQo=