86794 2012-05-17 19:06:51 -0700 [V8][Refactoring] Remove V8Proxy::throwError(const char*, v8::Isolate* = 0) 2012-05-17 20:38:32 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84074 1 haraken haraken abarth eric.carlson feature-media-reviews japhet webkit.review.bot oldest_to_newest 627220 0 haraken 2012-05-17 19:06:51 -0700 As commented here (https://bugs.webkit.org/show_bug.cgi?id=84074#c5), I am refactoring a series of confusing throwError()s. In this bug we remove throwError(const char*, v8::Isolate* = 0). 627221 1 142609 haraken 2012-05-17 19:08:27 -0700 Created attachment 142609 Patch 627293 2 142609 webkit.review.bot 2012-05-17 20:38:27 -0700 Comment on attachment 142609 Patch Clearing flags on attachment: 142609 Committed r117536: <http://trac.webkit.org/changeset/117536> 627294 3 webkit.review.bot 2012-05-17 20:38:32 -0700 All reviewed patches have been landed. Closing bug. 142609 2012-05-17 19:08:27 -0700 2012-05-17 20:38:27 -0700 Patch bug-86794-20120518110826.patch text/plain 15278 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDNmYmI5MjM5OTdkMTkz ZDhkMzVlMjQyYzg0YzdjYTA1YWYxMjZlOC4uZjFhZjMyNWJlMGE2N2ZiNGIwODI0NzZlYzJjOGE2 YWRiMjkwMTY4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTA1LTE3ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdW1JlZmFjdG9y aW5nXSBSZW1vdmUgVjhQcm94eTo6dGhyb3dFcnJvcihjb25zdCBjaGFyKiwgdjg6Oklzb2xhdGUq ID0gMCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2 Nzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXMg Y29tbWVudGVkIGhlcmUgKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 NDA3NCNjNSksCisgICAgICAgIEkgYW0gcmVmYWN0b3JpbmcgYSBzZXJpZXMgb2YgY29uZnVzaW5n IHRocm93RXJyb3IoKXMuCisgICAgICAgIFRoaXMgcGF0Y2ggcmVtb3ZlcyBWOFByb3h5Ojp0aHJv d0Vycm9yKGNvbnN0IGNoYXIqLCB2ODo6SXNvbGF0ZSogPSAwKS4KKworICAgICAgICBObyB0ZXN0 cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogYmluZGluZ3MvdjgvVjhVdGls aXRpZXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZXh0cmFjdFRyYW5zZmVyYWJsZXMpOgorICAg ICAgICAoV2ViQ29yZTo6Z2V0TWVzc2FnZVBvcnRBcnJheSk6CisgICAgICAgICogYmluZGluZ3Mv djgvY3VzdG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmg6CisgICAgICAgIChXZWJDb3JlOjpj b25zdHJ1Y3RXZWJHTEFycmF5V2l0aEFycmF5QnVmZmVyQXJndW1lbnQpOgorICAgICAgICAoV2Vi Q29yZTo6Y29uc3RydWN0V2ViR0xBcnJheSk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9t L1Y4QXVkaW9CdWZmZXJTb3VyY2VOb2RlQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4 QXVkaW9CdWZmZXJTb3VyY2VOb2RlOjpidWZmZXJBY2Nlc3NvclNldHRlcik6CisgICAgICAgICog YmluZGluZ3MvdjgvY3VzdG9tL1Y4Q2xpcGJvYXJkQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlY4Q2xpcGJvYXJkOjpzZXREcmFnSW1hZ2VDYWxsYmFjayk6CisgICAgICAgICogYmluZGlu Z3MvdjgvY3VzdG9tL1Y4SFRNTERvY3VtZW50Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlY4SFRNTERvY3VtZW50OjpvcGVuQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1 c3RvbS9WOEhUTUxJbnB1dEVsZW1lbnRDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhI VE1MSW5wdXRFbGVtZW50OjpzZWxlY3Rpb25TdGFydEFjY2Vzc29yR2V0dGVyKToKKyAgICAgICAg KFdlYkNvcmU6OlY4SFRNTElucHV0RWxlbWVudDo6c2VsZWN0aW9uU3RhcnRBY2Nlc3NvclNldHRl cik6CisgICAgICAgIChXZWJDb3JlOjpWOEhUTUxJbnB1dEVsZW1lbnQ6OnNlbGVjdGlvbkVuZEFj Y2Vzc29yR2V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlY4SFRNTElucHV0RWxlbWVudDo6c2Vs ZWN0aW9uRW5kQWNjZXNzb3JTZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VjhIVE1MSW5wdXRF bGVtZW50OjpzZWxlY3Rpb25EaXJlY3Rpb25BY2Nlc3NvckdldHRlcik6CisgICAgICAgIChXZWJD b3JlOjpWOEhUTUxJbnB1dEVsZW1lbnQ6OnNlbGVjdGlvbkRpcmVjdGlvbkFjY2Vzc29yU2V0dGVy KToKKyAgICAgICAgKFdlYkNvcmU6OlY4SFRNTElucHV0RWxlbWVudDo6c2V0U2VsZWN0aW9uUmFu Z2VDYWxsYmFjayk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTE1lZGlhRWxl bWVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOEhUTUxNZWRpYUVsZW1lbnQ6OmNv bnRyb2xsZXJBY2Nlc3NvclNldHRlcik6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4 SW5qZWN0ZWRTY3JpcHRIb3N0Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4SW5qZWN0 ZWRTY3JpcHRIb3N0OjppbnNwZWN0ZWRPYmplY3RDYWxsYmFjayk6CisKIDIwMTItMDUtMTcgIE1p Y2hhZWwgTW9zcyAgPG1tb3NzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBMaW51eCBhbWQ2NCBw bGF0Zm9ybSByZXBvcnRlZCBhcyBpNjg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9WOFByb3h5LmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgK aW5kZXggNWVjYjYzOTc3YTE1N2ZmZGVkYmUyZjQ1ZjdhZjQ5NDRjNWUwMmIwNC4uNDFkYzg1ZmE5 ZTMxNjBkMTZlYjY0NGU1ZDRjODU1NjJmM2RkMDc1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4UHJveHkuaApAQCAtMzI1LDEzICszMjUsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgIHJldHVybiB2ODo6TG9jYWw8djg6OkJvb2xlYW4+KCk7CiAgICAgfQogCi0gICAgaW5saW5l IHY4OjpIYW5kbGU8djg6OlByaW1pdGl2ZT4gdGhyb3dFcnJvcihjb25zdCBjaGFyKiBtZXNzYWdl LCB2ODo6SXNvbGF0ZSogaXNvbGF0ZSA9IDApCi0gICAgewotICAgICAgICBpZiAoIXY4OjpWODo6 SXNFeGVjdXRpb25UZXJtaW5hdGluZygpKQotICAgICAgICAgICAgVjhQcm94eTo6dGhyb3dFcnJv cihWOFByb3h5OjpUeXBlRXJyb3IsIG1lc3NhZ2UsIGlzb2xhdGUpOwotICAgICAgICByZXR1cm4g djg6OlVuZGVmaW5lZCgpOwotICAgIH0KLQogICAgIGlubGluZSB2ODo6SGFuZGxlPHY4OjpQcmlt aXRpdmU+IHRocm93RXJyb3IoY29uc3QgY2hhciogbWVzc2FnZSwgVjhQcm94eTo6RXJyb3JUeXBl IHR5cGUsIHY4OjpJc29sYXRlKiBpc29sYXRlID0gMCkKICAgICB7CiAgICAgICAgIGlmICghdjg6 OlY4OjpJc0V4ZWN1dGlvblRlcm1pbmF0aW5nKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9WOFV0aWxpdGllcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9WOFV0aWxpdGllcy5jcHAKaW5kZXggZDM5MDQ5YzhmMDQwNjQ4MWRiOTk3MjRlMDg5MThjNmZk MTViMmQzZC4uNjM2NGVmYzZhNzRmMzMyNzY3ZWM5NDE4Y2M5MmEzMGU0ODJhYzE3ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhVdGlsaXRpZXMuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcApAQCAtOTQsNyArOTQsNyBA QCBib29sIGV4dHJhY3RUcmFuc2ZlcmFibGVzKHY4OjpMb2NhbDx2ODo6VmFsdWU+IHZhbHVlLCBN ZXNzYWdlUG9ydEFycmF5JiBwb3J0cywgQQogICAgIH0KIAogICAgIGlmICghdmFsdWUtPklzT2Jq ZWN0KCkpIHsKLSAgICAgICAgdGhyb3dFcnJvcigiVHJhbnNmZXJBcnJheSBhcmd1bWVudCBtdXN0 IGJlIGFuIG9iamVjdCIpOworICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigiVHJhbnNm ZXJBcnJheSBhcmd1bWVudCBtdXN0IGJlIGFuIG9iamVjdCIpOwogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgfQogICAgIHVpbnQzMl90IGxlbmd0aCA9IDA7CkBAIC0xMDcsNyArMTA3LDcgQEAg Ym9vbCBleHRyYWN0VHJhbnNmZXJhYmxlcyh2ODo6TG9jYWw8djg6OlZhbHVlPiB2YWx1ZSwgTWVz c2FnZVBvcnRBcnJheSYgcG9ydHMsIEEKICAgICAgICAgLy8gU2VxdWVuY2UtdHlwZSBvYmplY3Qg LSBnZXQgdGhlIGxlbmd0aCBhdHRyaWJ1dGUKICAgICAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4g c2VxdWVuY2VMZW5ndGggPSB0cmFuc2ZlcnJhYmxlcy0+R2V0KHY4OjpTdHJpbmc6Ok5ldygibGVu Z3RoIikpOwogICAgICAgICBpZiAoIXNlcXVlbmNlTGVuZ3RoLT5Jc051bWJlcigpKSB7Ci0gICAg ICAgICAgICB0aHJvd0Vycm9yKCJUcmFuc2ZlckFycmF5IGFyZ3VtZW50IGhhcyBubyBsZW5ndGgg YXR0cmlidXRlIik7CisgICAgICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigiVHJhbnNm ZXJBcnJheSBhcmd1bWVudCBoYXMgbm8gbGVuZ3RoIGF0dHJpYnV0ZSIpOwogICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAgICAgICAgIGxlbmd0aCA9IHNlcXVlbmNlTGVuZ3Ro LT5VaW50MzJWYWx1ZSgpOwpAQCAtMTI3LDcgKzEyNyw3IEBAIGJvb2wgZXh0cmFjdFRyYW5zZmVy YWJsZXModjg6OkxvY2FsPHY4OjpWYWx1ZT4gdmFsdWUsIE1lc3NhZ2VQb3J0QXJyYXkmIHBvcnRz LCBBCiAgICAgICAgIGVsc2UgaWYgKFY4QXJyYXlCdWZmZXI6Okhhc0luc3RhbmNlKHRyYW5zZmVy cmFibGUpKQogICAgICAgICAgICAgYXJyYXlCdWZmZXJzLmFwcGVuZChWOEFycmF5QnVmZmVyOjp0 b05hdGl2ZSh2ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KHRyYW5zZmVycmFibGUpKSk7CiAg ICAgICAgIGVsc2UgewotICAgICAgICAgICAgdGhyb3dFcnJvcigiVHJhbnNmZXJBcnJheSBhcmd1 bWVudCBtdXN0IGNvbnRhaW4gb25seSBUcmFuc2ZlcmFibGVzIik7CisgICAgICAgICAgICBWOFBy b3h5Ojp0aHJvd1R5cGVFcnJvcigiVHJhbnNmZXJBcnJheSBhcmd1bWVudCBtdXN0IGNvbnRhaW4g b25seSBUcmFuc2ZlcmFibGVzIik7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAg IH0KICAgICB9CkBAIC0xNDEsNyArMTQxLDcgQEAgYm9vbCBnZXRNZXNzYWdlUG9ydEFycmF5KHY4 OjpMb2NhbDx2ODo6VmFsdWU+IHZhbHVlLCBNZXNzYWdlUG9ydEFycmF5JiBwb3J0cykKICAgICBp ZiAoIXJlc3VsdCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmIChhcnJheUJ1ZmZlcnMu c2l6ZSgpID4gMCkgewotICAgICAgICB0aHJvd0Vycm9yKCJNZXNzYWdlUG9ydEFycmF5IGFyZ3Vt ZW50IG11c3QgY29udGFpbiBvbmx5IE1lc3NhZ2VQb3J0cyIpOworICAgICAgICBWOFByb3h5Ojp0 aHJvd1R5cGVFcnJvcigiTWVzc2FnZVBvcnRBcnJheSBhcmd1bWVudCBtdXN0IGNvbnRhaW4gb25s eSBNZXNzYWdlUG9ydHMiKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KICAgICByZXR1 cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OEFycmF5QnVmZmVyVmlld0N1c3RvbS5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmgKaW5kZXggNGMwZWI4NjczNmE1OTlhYTBjNGQ3 YTJmMWI3NDgxYWQ5YmVjMTBmMi4uZTNjMjMxMjQyMThmZGMxZTIxMWRkMzEzZWU3YWIwYTgxNjNk OTEyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4QXJy YXlCdWZmZXJWaWV3Q3VzdG9tLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmgKQEAgLTYwLDIwICs2MCwyMCBAQCB2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4gY29uc3RydWN0V2ViR0xBcnJheVdpdGhBcnJheUJ1ZmZlckFyZ3VtZW50 KGNvbnN0IHY4OjpBcmd1bQogewogICAgIEFycmF5QnVmZmVyKiBidWYgPSBWOEFycmF5QnVmZmVy Ojp0b05hdGl2ZShhcmdzWzBdLT5Ub09iamVjdCgpKTsKICAgICBpZiAoIWJ1ZikKLSAgICAgICAg cmV0dXJuIHRocm93RXJyb3IoIkNvdWxkIG5vdCBjb252ZXJ0IGFyZ3VtZW50IDAgdG8gYSBBcnJh eUJ1ZmZlciIpOworICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoIkNvdWxk IG5vdCBjb252ZXJ0IGFyZ3VtZW50IDAgdG8gYSBBcnJheUJ1ZmZlciIpOwogICAgIGJvb2wgb2s7 CiAgICAgdWludDMyX3Qgb2Zmc2V0ID0gMDsKICAgICBpbnQgYXJnTGVuID0gYXJncy5MZW5ndGgo KTsKICAgICBpZiAoYXJnTGVuID4gMSkgewogICAgICAgICBvZmZzZXQgPSB0b1VJbnQzMihhcmdz WzFdLCBvayk7CiAgICAgICAgIGlmICghb2spCi0gICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJv cigiQ291bGQgbm90IGNvbnZlcnQgYXJndW1lbnQgMSB0byBhIG51bWJlciIpOworICAgICAgICAg ICAgcmV0dXJuIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCJDb3VsZCBub3QgY29udmVydCBhcmd1 bWVudCAxIHRvIGEgbnVtYmVyIik7CiAgICAgfQogICAgIHVpbnQzMl90IGxlbmd0aCA9IDA7CiAg ICAgaWYgKGFyZ0xlbiA+IDIpIHsKICAgICAgICAgbGVuZ3RoID0gdG9VSW50MzIoYXJnc1syXSwg b2spOwogICAgICAgICBpZiAoIW9rKQotICAgICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoIkNv dWxkIG5vdCBjb252ZXJ0IGFyZ3VtZW50IDIgdG8gYSBudW1iZXIiKTsKKyAgICAgICAgICAgIHJl dHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigiQ291bGQgbm90IGNvbnZlcnQgYXJndW1lbnQg MiB0byBhIG51bWJlciIpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmICgoYnVmLT5ieXRlTGVu Z3RoKCkgLSBvZmZzZXQpICUgc2l6ZW9mKEVsZW1lbnRUeXBlKSkKICAgICAgICAgICAgIHJldHVy biBWOFByb3h5Ojp0aHJvd0Vycm9yKFY4UHJveHk6OlJhbmdlRXJyb3IsICJBcnJheUJ1ZmZlciBs ZW5ndGggbWludXMgdGhlIGJ5dGVPZmZzZXQgaXMgbm90IGEgbXVsdGlwbGUgb2YgdGhlIGVsZW1l bnQgc2l6ZS4iKTsKQEAgLTE1Myw3ICsxNTMsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gY29u c3RydWN0V2ViR0xBcnJheShjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzLCBXcmFwcGVyVHlwZQog ICAgIGlmIChhcmdzWzBdLT5Jc09iamVjdCgpKSB7CiAgICAgICAgIHNyY0FycmF5ID0gYXJnc1sw XS0+VG9PYmplY3QoKTsKICAgICAgICAgaWYgKHNyY0FycmF5LklzRW1wdHkoKSkKLSAgICAgICAg ICAgIHJldHVybiB0aHJvd0Vycm9yKCJDb3VsZCBub3QgY29udmVydCBhcmd1bWVudCAwIHRvIGFu IGFycmF5Iik7CisgICAgICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoIkNv dWxkIG5vdCBjb252ZXJ0IGFyZ3VtZW50IDAgdG8gYW4gYXJyYXkiKTsKICAgICAgICAgbGVuID0g dG9VSW50MzIoc3JjQXJyYXktPkdldCh2ODo6U3RyaW5nOjpOZXcoImxlbmd0aCIpKSk7CiAgICAg ICAgIGRvSW5zdGFudGlhdGlvbiA9IHRydWU7CiAgICAgfSBlbHNlIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEF1ZGlvQnVmZmVyU291cmNlTm9kZUN1 c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBdWRpb0J1ZmZl clNvdXJjZU5vZGVDdXN0b20uY3BwCmluZGV4IDhkODcwYmUxMTQ4YzY4ZDgwZjlmODNhNGI0MmIy MjNmYzQ0YmFlNjYuLjc5ZTAyZThhMDRiYWM2YjI0ZDY3NDczMTU2NzY5NWYwNDYzMjMwZDAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEF1ZGlvQnVmZmVy U291cmNlTm9kZUN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4QXVkaW9CdWZmZXJTb3VyY2VOb2RlQ3VzdG9tLmNwcApAQCAtNDcsMTMgKzQ3LDEzIEBA IHZvaWQgVjhBdWRpb0J1ZmZlclNvdXJjZU5vZGU6OmJ1ZmZlckFjY2Vzc29yU2V0dGVyKHY4OjpM b2NhbDx2ODo6U3RyaW5nPiBuYW1lLCB2CiAgICAgaWYgKFY4QXVkaW9CdWZmZXI6Okhhc0luc3Rh bmNlKHZhbHVlKSkgewogICAgICAgICBidWZmZXIgPSBWOEF1ZGlvQnVmZmVyOjp0b05hdGl2ZSh2 YWx1ZS0+VG9PYmplY3QoKSk7CiAgICAgICAgIGlmIChidWZmZXIgJiYgIWltcC0+c2V0QnVmZmVy KGJ1ZmZlcikpIHsKLSAgICAgICAgICAgIHRocm93RXJyb3IoIkF1ZGlvQnVmZmVyIHVuc3VwcG9y dGVkIG51bWJlciBvZiBjaGFubmVscyIpOworICAgICAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBl RXJyb3IoIkF1ZGlvQnVmZmVyIHVuc3VwcG9ydGVkIG51bWJlciBvZiBjaGFubmVscyIpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQogICAgIAogICAgIGlmICghYnVmZmVy KSB7Ci0gICAgICAgIHRocm93RXJyb3IoIlZhbHVlIGlzIG5vdCBvZiB0eXBlIEF1ZGlvQnVmZmVy Iik7CisgICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCJWYWx1ZSBpcyBub3Qgb2YgdHlw ZSBBdWRpb0J1ZmZlciIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q2xpcGJvYXJkQ3VzdG9tLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOENsaXBib2FyZEN1c3RvbS5jcHAK aW5kZXggYzc3ZDJiNmEzNWMzODFhMzVmN2I2Y2FlYWY0NmM4MGEwOWEyNGI5Mi4uZmJjM2QwMTkx Mjg1M2VlNjkxNzAyNDU4MDk5ZTYwOTA1NWI4NmIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q2xpcGJvYXJkQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDbGlwYm9hcmRDdXN0b20uY3BwCkBAIC05OSw3 ICs5OSw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOENsaXBib2FyZDo6c2V0RHJhZ0ltYWdl Q2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJnCiAgICAgICAgIG5vZGUgPSBWOE5vZGU6 OnRvTmF0aXZlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QoYXJnc1swXSkpOwogCiAgICAg aWYgKCFub2RlIHx8ICFub2RlLT5pc0VsZW1lbnROb2RlKCkpCi0gICAgICAgIHJldHVybiB0aHJv d0Vycm9yKCJzZXREcmFnSW1hZ2VGcm9tRWxlbWVudDogSW52YWxpZCBmaXJzdCBhcmd1bWVudCIp OworICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoInNldERyYWdJbWFnZUZy b21FbGVtZW50OiBJbnZhbGlkIGZpcnN0IGFyZ3VtZW50Iik7CiAKICAgICBpZiAoc3RhdGljX2Nh c3Q8RWxlbWVudCo+KG5vZGUpLT5oYXNMb2NhbE5hbWUoSFRNTE5hbWVzOjppbWdUYWcpICYmICFu b2RlLT5pbkRvY3VtZW50KCkpCiAgICAgICAgIGNsaXBib2FyZC0+c2V0RHJhZ0ltYWdlKHN0YXRp Y19jYXN0PEhUTUxJbWFnZUVsZW1lbnQqPihub2RlKS0+Y2FjaGVkSW1hZ2UoKSwgSW50UG9pbnQo eCwgeSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4 SFRNTERvY3VtZW50Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOEhUTUxEb2N1bWVudEN1c3RvbS5jcHAKaW5kZXggYjVkODU3NTI1NDdlNmQ4OGUwZWE0YjFl M2RiODI0ZTI1NWRjZWIwOC4uMDZlMTY1ZTQ5OWE0YTc1MDkxMTUwOGQwYjczOTQ5NTg5ZDA3NmU3 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTERv Y3VtZW50Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20v VjhIVE1MRG9jdW1lbnRDdXN0b20uY3BwCkBAIC0xNDksNyArMTQ5LDcgQEAgdjg6OkhhbmRsZTx2 ODo6VmFsdWU+IFY4SFRNTERvY3VtZW50OjpvcGVuQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50 cyYgYXJncykKICAgICAgICAgICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IGZ1bmN0aW9uID0gZ2xv YmFsLT5HZXQodjg6OlN0cmluZzo6TmV3KCJvcGVuIikpOwogICAgICAgICAgICAgLy8gSWYgdGhl IG9wZW4gcHJvcGVydHkgaXMgbm90IGEgZnVuY3Rpb24gdGhyb3cgYSB0eXBlIGVycm9yLgogICAg ICAgICAgICAgaWYgKCFmdW5jdGlvbi0+SXNGdW5jdGlvbigpKSB7Ci0gICAgICAgICAgICAgICAg dGhyb3dFcnJvcigib3BlbiBpcyBub3QgYSBmdW5jdGlvbiIpOworICAgICAgICAgICAgICAgIFY4 UHJveHk6OnRocm93VHlwZUVycm9yKCJvcGVuIGlzIG5vdCBhIGZ1bmN0aW9uIik7CiAgICAgICAg ICAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKICAgICAgICAgICAgIH0KICAgICAgICAg ICAgIC8vIFdyYXAgdXAgdGhlIGFyZ3VtZW50cyBhbmQgY2FsbCB0aGUgZnVuY3Rpb24uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MSW5wdXRFbGVt ZW50Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxJ bnB1dEVsZW1lbnRDdXN0b20uY3BwCmluZGV4IGM3NGQzZjZkMjA1ZWRiOGU1MjE1NGMxZjhhNjQ1 MWMzNDMyZGFiYmEuLjY1Njg2NTQ2ZTQ5YTBhYzg3NTViMjJmMzE0MDg0ZDA5MzlkMjdjMmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxJbnB1dEVs ZW1lbnRDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OEhUTUxJbnB1dEVsZW1lbnRDdXN0b20uY3BwCkBAIC00NSw3ICs0NSw3IEBAIHY4OjpIYW5kbGU8 djg6OlZhbHVlPiBWOEhUTUxJbnB1dEVsZW1lbnQ6OnNlbGVjdGlvblN0YXJ0QWNjZXNzb3JHZXR0 ZXIodjg6OkxvY2FsCiAgICAgSFRNTElucHV0RWxlbWVudCogaW1wID0gVjhIVE1MSW5wdXRFbGVt ZW50Ojp0b05hdGl2ZShob2xkZXIpOwogCiAgICAgaWYgKCFpbXAtPmNhbkhhdmVTZWxlY3Rpb24o KSkKLSAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoIkFjY2Vzc2luZyBzZWxlY3Rpb25TdGFydCBv biBhbiBpbnB1dCBlbGVtZW50IHRoYXQgY2Fubm90IGhhdmUgYSBzZWxlY3Rpb24uIik7CisgICAg ICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigiQWNjZXNzaW5nIHNlbGVjdGlvblN0 YXJ0IG9uIGFuIGlucHV0IGVsZW1lbnQgdGhhdCBjYW5ub3QgaGF2ZSBhIHNlbGVjdGlvbi4iKTsK IAogICAgIGludCB2ID0gaW1wLT5zZWxlY3Rpb25TdGFydCgpOwogICAgIHJldHVybiB2ODo6SW50 ZWdlcjo6TmV3KHYpOwpAQCAtNTgsNyArNTgsNyBAQCB2b2lkIFY4SFRNTElucHV0RWxlbWVudDo6 c2VsZWN0aW9uU3RhcnRBY2Nlc3NvclNldHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZQog ICAgIEhUTUxJbnB1dEVsZW1lbnQqIGltcCA9IFY4SFRNTElucHV0RWxlbWVudDo6dG9OYXRpdmUo aG9sZGVyKTsKIAogICAgIGlmICghaW1wLT5jYW5IYXZlU2VsZWN0aW9uKCkpIHsKLSAgICAgICAg dGhyb3dFcnJvcigiQWNjZXNzaW5nIHNlbGVjdGlvblN0YXJ0IG9uIGFuIGlucHV0IGVsZW1lbnQg dGhhdCBjYW5ub3QgaGF2ZSBhIHNlbGVjdGlvbi4iKTsKKyAgICAgICAgVjhQcm94eTo6dGhyb3dU eXBlRXJyb3IoIkFjY2Vzc2luZyBzZWxlY3Rpb25TdGFydCBvbiBhbiBpbnB1dCBlbGVtZW50IHRo YXQgY2Fubm90IGhhdmUgYSBzZWxlY3Rpb24uIik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAg ICAgaW1wLT5zZXRTZWxlY3Rpb25TdGFydCh2YWx1ZS0+SW50MzJWYWx1ZSgpKTsKQEAgLTcxLDcg KzcxLDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4SFRNTElucHV0RWxlbWVudDo6c2VsZWN0 aW9uRW5kQWNjZXNzb3JHZXR0ZXIodjg6OkxvY2FsPHYKICAgICBIVE1MSW5wdXRFbGVtZW50KiBp bXAgPSBWOEhUTUxJbnB1dEVsZW1lbnQ6OnRvTmF0aXZlKGhvbGRlcik7CiAKICAgICBpZiAoIWlt cC0+Y2FuSGF2ZVNlbGVjdGlvbigpKQotICAgICAgICByZXR1cm4gdGhyb3dFcnJvcigiQWNjZXNz aW5nIHNlbGVjdGlvbkVuZCBvbiBhbiBpbnB1dCBlbGVtZW50IHRoYXQgY2Fubm90IGhhdmUgYSBz ZWxlY3Rpb24uIik7CisgICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigiQWNj ZXNzaW5nIHNlbGVjdGlvbkVuZCBvbiBhbiBpbnB1dCBlbGVtZW50IHRoYXQgY2Fubm90IGhhdmUg YSBzZWxlY3Rpb24uIik7CiAKICAgICBpbnQgdiA9IGltcC0+c2VsZWN0aW9uRW5kKCk7CiAgICAg cmV0dXJuIHY4OjpJbnRlZ2VyOjpOZXcodik7CkBAIC04NCw3ICs4NCw3IEBAIHZvaWQgVjhIVE1M SW5wdXRFbGVtZW50OjpzZWxlY3Rpb25FbmRBY2Nlc3NvclNldHRlcih2ODo6TG9jYWw8djg6OlN0 cmluZz4gbmFtZSwKICAgICBIVE1MSW5wdXRFbGVtZW50KiBpbXAgPSBWOEhUTUxJbnB1dEVsZW1l bnQ6OnRvTmF0aXZlKGhvbGRlcik7CiAKICAgICBpZiAoIWltcC0+Y2FuSGF2ZVNlbGVjdGlvbigp KSB7Ci0gICAgICAgIHRocm93RXJyb3IoIkFjY2Vzc2luZyBzZWxlY3Rpb25FbmQgb24gYW4gaW5w dXQgZWxlbWVudCB0aGF0IGNhbm5vdCBoYXZlIGEgc2VsZWN0aW9uLiIpOworICAgICAgICBWOFBy b3h5Ojp0aHJvd1R5cGVFcnJvcigiQWNjZXNzaW5nIHNlbGVjdGlvbkVuZCBvbiBhbiBpbnB1dCBl bGVtZW50IHRoYXQgY2Fubm90IGhhdmUgYSBzZWxlY3Rpb24uIik7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKQEAgLTk4LDcgKzk4LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4SFRNTElu cHV0RWxlbWVudDo6c2VsZWN0aW9uRGlyZWN0aW9uQWNjZXNzb3JHZXR0ZXIodjg6OkwKICAgICBI VE1MSW5wdXRFbGVtZW50KiBpbXAgPSBWOEhUTUxJbnB1dEVsZW1lbnQ6OnRvTmF0aXZlKGhvbGRl cik7CiAKICAgICBpZiAoIWltcC0+Y2FuSGF2ZVNlbGVjdGlvbigpKQotICAgICAgICByZXR1cm4g dGhyb3dFcnJvcigiQWNjZXNzaW5nIHNlbGVjdGlvbkRpcmVjdGlvbiBvbiBhbiBpbnB1dCBlbGVt ZW50IHRoYXQgY2Fubm90IGhhdmUgYSBzZWxlY3Rpb24uIik7CisgICAgICAgIHJldHVybiBWOFBy b3h5Ojp0aHJvd1R5cGVFcnJvcigiQWNjZXNzaW5nIHNlbGVjdGlvbkRpcmVjdGlvbiBvbiBhbiBp bnB1dCBlbGVtZW50IHRoYXQgY2Fubm90IGhhdmUgYSBzZWxlY3Rpb24uIik7CiAKICAgICByZXR1 cm4gdjhTdHJpbmcoaW1wLT5zZWxlY3Rpb25EaXJlY3Rpb24oKSk7CiB9CkBAIC0xMTAsNyArMTEw LDcgQEAgdm9pZCBWOEhUTUxJbnB1dEVsZW1lbnQ6OnNlbGVjdGlvbkRpcmVjdGlvbkFjY2Vzc29y U2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPgogICAgIEhUTUxJbnB1dEVsZW1lbnQqIGltcCA9 IFY4SFRNTElucHV0RWxlbWVudDo6dG9OYXRpdmUoaG9sZGVyKTsKIAogICAgIGlmICghaW1wLT5j YW5IYXZlU2VsZWN0aW9uKCkpIHsKLSAgICAgICAgdGhyb3dFcnJvcigiQWNjZXNzaW5nIHNlbGVj dGlvbkRpcmVjdGlvbiBvbiBhbiBpbnB1dCBlbGVtZW50IHRoYXQgY2Fubm90IGhhdmUgYSBzZWxl Y3Rpb24uIik7CisgICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCJBY2Nlc3Npbmcgc2Vs ZWN0aW9uRGlyZWN0aW9uIG9uIGFuIGlucHV0IGVsZW1lbnQgdGhhdCBjYW5ub3QgaGF2ZSBhIHNl bGVjdGlvbi4iKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTI0LDcgKzEyNCw3IEBA IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOEhUTUxJbnB1dEVsZW1lbnQ6OnNldFNlbGVjdGlvblJh bmdlQ2FsbGJhY2soY29uc3Qgdjg6OkFyCiAgICAgSFRNTElucHV0RWxlbWVudCogaW1wID0gVjhI VE1MSW5wdXRFbGVtZW50Ojp0b05hdGl2ZShob2xkZXIpOwogCiAgICAgaWYgKCFpbXAtPmNhbkhh dmVTZWxlY3Rpb24oKSkKLSAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoIkNhbGxpbmcgc2V0U2Vs ZWN0aW9uUmFuZ2Ugb24gYW4gaW5wdXQgZWxlbWVudCB0aGF0IGNhbm5vdCBoYXZlIGEgc2VsZWN0 aW9uLiIpOworICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoIkNhbGxpbmcg c2V0U2VsZWN0aW9uUmFuZ2Ugb24gYW4gaW5wdXQgZWxlbWVudCB0aGF0IGNhbm5vdCBoYXZlIGEg c2VsZWN0aW9uLiIpOwogCiAgICAgaW50IHN0YXJ0ID0gYXJnc1swXS0+SW50MzJWYWx1ZSgpOwog ICAgIGludCBlbmQgPSBhcmdzWzFdLT5JbnQzMlZhbHVlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MTWVkaWFFbGVtZW50Q3VzdG9tLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxNZWRpYUVsZW1lbnRDdXN0 b20uY3BwCmluZGV4IGU5MjUwNGNjNmVlNWM3NGVhNDgyNmJhYzhkMWEzZTBhODdmNDVlNDQuLjdj YjIyNzZkOGQ5Y2NkMjEyNzVhMTgxMjFlMTdlMTZhOWMwMDNhYWEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxNZWRpYUVsZW1lbnRDdXN0b20uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxNZWRpYUVsZW1l bnRDdXN0b20uY3BwCkBAIC00Myw3ICs0Myw3IEBAIHZvaWQgVjhIVE1MTWVkaWFFbGVtZW50Ojpj b250cm9sbGVyQWNjZXNzb3JTZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIHY4CiAg ICAgICAgIGNvbnRyb2xsZXIgPSBWOE1lZGlhQ29udHJvbGxlcjo6dG9OYXRpdmUodmFsdWUtPlRv T2JqZWN0KCkpOwogICAgIAogICAgIGlmICghY29udHJvbGxlcikgewotICAgICAgICB0aHJvd0Vy cm9yKCJWYWx1ZSBpcyBub3Qgb2YgdHlwZSBNZWRpYUNvbnRyb2xsZXIiKTsKKyAgICAgICAgVjhQ cm94eTo6dGhyb3dUeXBlRXJyb3IoIlZhbHVlIGlzIG5vdCBvZiB0eXBlIE1lZGlhQ29udHJvbGxl ciIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9jdXN0b20vVjhJbmplY3RlZFNjcmlwdEhvc3RDdXN0b20uY3BwIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SW5qZWN0ZWRTY3JpcHRIb3N0Q3VzdG9t LmNwcAppbmRleCA4N2QxOTVhY2VhMzlmY2FlNmJhNzgwYjAyMTZmYWYwMTMzZWEzYmEwLi45Zjk3 ODBjN2Q5OWI5MmNkYWU2Zjc0MjU2NmVhMDU5NjBjMzkwOTJkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhJbmplY3RlZFNjcmlwdEhvc3RDdXN0b20uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEluamVjdGVkU2NyaXB0 SG9zdEN1c3RvbS5jcHAKQEAgLTgzLDcgKzgzLDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4 SW5qZWN0ZWRTY3JpcHRIb3N0OjppbnNwZWN0ZWRPYmplY3RDYWxsYmFjayhjb25zdCB2ODo6QXIK ICAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKIAogICAgIGlmICghYXJnc1swXS0+SXNJ bnQzMigpKSB7Ci0gICAgICAgIHRocm93RXJyb3IoImFyZ3VtZW50IGhhcyB0byBiZSBhbiBpbnRl Z2VyIik7CisgICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCJhcmd1bWVudCBoYXMgdG8g YmUgYW4gaW50ZWdlciIpOwogICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwogICAgIH0K IAo=