157536 2016-05-10 14:38:13 -0700 Make the different evaluateWithScopeExtension implementations more consistent 2016-05-10 16:11:10 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck joepeck bburg commit-queue keith_miller mark.lam msaboff saam timothy oldest_to_newest 1191662 0 joepeck 2016-05-10 14:38:13 -0700 * SUMMARY Make the different evaluateWithScopeExtension implementations more consistent. Currently they slightly differ in handling exceptions and error messages. Make them consistent. 1191664 1 278533 joepeck 2016-05-10 14:40:30 -0700 Created attachment 278533 [PATCH] Proposed Fix Nice and clean now for both impls. 1191709 2 278533 commit-queue 2016-05-10 16:11:04 -0700 Comment on attachment 278533 [PATCH] Proposed Fix Clearing flags on attachment: 278533 Committed r200648: <http://trac.webkit.org/changeset/200648> 1191710 3 commit-queue 2016-05-10 16:11:10 -0700 All reviewed patches have been landed. Closing bug. 278533 2016-05-10 14:40:30 -0700 2016-05-10 16:11:04 -0700 [PATCH] Proposed Fix cleanup.patch text/plain 5286 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDYxNDU1M2EuLmZhNjhjM2MgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE2LTA1LTEwICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgTWFrZSB0aGUgZGlmZmVyZW50IGV2 YWx1YXRlV2l0aFNjb3BlRXh0ZW5zaW9uIGltcGxlbWVudGF0aW9ucyBtb3JlIGNvbnNpc3RlbnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzUzNgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVj dG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6SlNJbmpl Y3RlZFNjcmlwdEhvc3Q6OmV2YWx1YXRlV2l0aFNjb3BlRXh0ZW5zaW9uKToKKyAgICAgICAgVGhy b3cgdGhlIGV4Y2VwdGlvbiBjb25zaXN0ZW50IHdpdGggSlNKYXZhU2NyaXB0Q2FsbEZyYW1lLgor CisgICAgICAgICogaW5zcGVjdG9yL0pTSmF2YVNjcmlwdENhbGxGcmFtZS5jcHA6CisgICAgICAg IChJbnNwZWN0b3I6OkpTSmF2YVNjcmlwdENhbGxGcmFtZTo6ZXZhbHVhdGVXaXRoU2NvcGVFeHRl bnNpb24pOgorICAgICAgICBCZXR0ZXIgZXJyb3IgbWVzc2FnZSBjb25zaXN0ZW50IHdpdGggSW5q ZWN0ZWRTY3JpcHRIb3N0LgorCisgICAgICAgICogcnVudGltZS9Db21wbGV0aW9uLmg6CisgICAg ICAgICogcnVudGltZS9Db21wbGV0aW9uLmNwcDoKKyAgICAgICAgKEpTQzo6ZXZhbHVhdGVXaXRo U2NvcGVFeHRlbnNpb24pOgorICAgICAgICBHaXZlIHRoaXMgYW4gRXhjZXB0aW9uIG91dCBwYXJh bWV0ZXIgbGlrZSBvdGhlciBldmFsdWF0aW9ucworICAgICAgICBzbyB0aGUgY2FsbGVyIGNhbiBk ZWNpZGUgd2hhdCB0byBkbyB3aXRoIGl0LgorCisyMDE2LTA1LTEwICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogRWxpbWluYXRl IHRoZSBjcmF6eSBjb2RlIGZvciBldmFsdWF0ZU9uQ2FsbEZyYW1lCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTc1MTAKICAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzI2MTkxMzMyPgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcAppbmRleCBmNjU0ZGE4Li44NmNjMmUyIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3Jp cHRIb3N0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0 ZWRTY3JpcHRIb3N0LmNwcApAQCAtMTA0LDggKzEwNCwxMyBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRT Y3JpcHRIb3N0OjpldmFsdWF0ZVdpdGhTY29wZUV4dGVuc2lvbihFeGVjU3RhdGUqIGV4ZWMpCiAg ICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAgICByZXR1cm4ganNVbmRlZmluZWQo KTsKIAorICAgIE5ha2VkUHRyPEV4Y2VwdGlvbj4gZXhjZXB0aW9uOwogICAgIEpTT2JqZWN0KiBz Y29wZUV4dGVuc2lvbiA9IGV4ZWMtPmFyZ3VtZW50KDEpLmdldE9iamVjdCgpOwotICAgIHJldHVy biBKU0M6OmV2YWx1YXRlV2l0aFNjb3BlRXh0ZW5zaW9uKGV4ZWMsIG1ha2VTb3VyY2UocHJvZ3Jh bSksIHNjb3BlRXh0ZW5zaW9uKTsKKyAgICBKU1ZhbHVlIHJlc3VsdCA9IEpTQzo6ZXZhbHVhdGVX aXRoU2NvcGVFeHRlbnNpb24oZXhlYywgbWFrZVNvdXJjZShwcm9ncmFtKSwgc2NvcGVFeHRlbnNp b24sIGV4Y2VwdGlvbik7CisgICAgaWYgKGV4Y2VwdGlvbikKKyAgICAgICAgZXhlYy0+dm0oKS50 aHJvd0V4Y2VwdGlvbihleGVjLCBleGNlcHRpb24pOworCisgICAgcmV0dXJuIHJlc3VsdDsKIH0K IAogSlNWYWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6aW50ZXJuYWxDb25zdHJ1Y3Rvck5hbWUo RXhlY1N0YXRlKiBleGVjKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9KU0phdmFTY3JpcHRDYWxsRnJhbWUuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2lu c3BlY3Rvci9KU0phdmFTY3JpcHRDYWxsRnJhbWUuY3BwCmluZGV4IDJkZDBhOWMuLjc5MzMyZTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNKYXZhU2NyaXB0 Q2FsbEZyYW1lLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSmF2 YVNjcmlwdENhbGxGcmFtZS5jcHAKQEAgLTc1LDcgKzc1LDExIEBAIEpTSmF2YVNjcmlwdENhbGxG cmFtZTo6fkpTSmF2YVNjcmlwdENhbGxGcmFtZSgpCiAKIEpTVmFsdWUgSlNKYXZhU2NyaXB0Q2Fs bEZyYW1lOjpldmFsdWF0ZVdpdGhTY29wZUV4dGVuc2lvbihFeGVjU3RhdGUqIGV4ZWMpCiB7Ci0g ICAgU3RyaW5nIHNjcmlwdCA9IGV4ZWMtPmFyZ3VtZW50KDApLnRvU3RyaW5nKGV4ZWMpLT52YWx1 ZShleGVjKTsKKyAgICBKU1ZhbHVlIHNjcmlwdFZhbHVlID0gZXhlYy0+YXJndW1lbnQoMCk7Cisg ICAgaWYgKCFzY3JpcHRWYWx1ZS5pc1N0cmluZygpKQorICAgICAgICByZXR1cm4gdGhyb3dUeXBl RXJyb3IoZXhlYywgIkpTSmF2YVNjcmlwdENhbGxGcmFtZS5ldmFsdWF0ZVdpdGhTY29wZUV4dGVu c2lvbiBmaXJzdCBhcmd1bWVudCBtdXN0IGJlIGEgc3RyaW5nLiIpOworCisgICAgU3RyaW5nIHNj cmlwdCA9IHNjcmlwdFZhbHVlLnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKTsKICAgICBpZiAo ZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21wbGV0aW9uLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbXBsZXRpb24uY3BwCmluZGV4IDQ3MmQ3 MDAuLmRlYzU1NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Nv bXBsZXRpb24uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbXBsZXRp b24uY3BwCkBAIC0xMjIsNyArMTIyLDcgQEAgSlNWYWx1ZSBwcm9maWxlZEV2YWx1YXRlKEV4ZWNT dGF0ZSogZXhlYywgUHJvZmlsaW5nUmVhc29uIHJlYXNvbiwgY29uc3QgU291cmNlQ28KICAgICBy ZXR1cm4gZXZhbHVhdGUoZXhlYywgc291cmNlLCB0aGlzVmFsdWUsIHJldHVybmVkRXhjZXB0aW9u KTsKIH0KIAotSlNWYWx1ZSBldmFsdWF0ZVdpdGhTY29wZUV4dGVuc2lvbihFeGVjU3RhdGUqIGV4 ZWMsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSwgSlNPYmplY3QqIHNjb3BlRXh0ZW5zaW9uT2Jq ZWN0KQorSlNWYWx1ZSBldmFsdWF0ZVdpdGhTY29wZUV4dGVuc2lvbihFeGVjU3RhdGUqIGV4ZWMs IGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSwgSlNPYmplY3QqIHNjb3BlRXh0ZW5zaW9uT2JqZWN0 LCBOYWtlZFB0cjxFeGNlcHRpb24+JiByZXR1cm5lZEV4Y2VwdGlvbikKIHsKICAgICBKU0dsb2Jh bE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gZXhlYy0+dm1FbnRyeUdsb2JhbE9iamVjdCgpOwogCkBA IC0xMzEsMTIgKzEzMSw3IEBAIEpTVmFsdWUgZXZhbHVhdGVXaXRoU2NvcGVFeHRlbnNpb24oRXhl Y1N0YXRlKiBleGVjLCBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2UsIEpTCiAgICAgICAgIGdsb2Jh bE9iamVjdC0+c2V0R2xvYmFsU2NvcGVFeHRlbnNpb24oSlNXaXRoU2NvcGU6OmNyZWF0ZShleGVj LT52bSgpLCBnbG9iYWxPYmplY3QsIHNjb3BlRXh0ZW5zaW9uT2JqZWN0LCBpZ25vcmVkUHJldmlv dXNTY29wZSkpOwogICAgIH0KIAotICAgIE5ha2VkUHRyPEV4Y2VwdGlvbj4gZXhjZXB0aW9uOwot ICAgIEpTVmFsdWUgcmV0dXJuVmFsdWUgPSBKU0M6OmV2YWx1YXRlKGdsb2JhbE9iamVjdC0+Z2xv YmFsRXhlYygpLCBzb3VyY2UsIGdsb2JhbE9iamVjdCwgZXhjZXB0aW9uKTsKLQotICAgIC8vIERv bid0IHN3YWxsb3cgdGhlIGV4Y2VwdGlvbi4KLSAgICBpZiAoZXhjZXB0aW9uKQotICAgICAgICBn bG9iYWxPYmplY3QtPnZtKCkucmVzdG9yZVByZXZpb3VzRXhjZXB0aW9uKGV4Y2VwdGlvbik7Cisg ICAgSlNWYWx1ZSByZXR1cm5WYWx1ZSA9IEpTQzo6ZXZhbHVhdGUoZ2xvYmFsT2JqZWN0LT5nbG9i YWxFeGVjKCksIHNvdXJjZSwgZ2xvYmFsT2JqZWN0LCByZXR1cm5lZEV4Y2VwdGlvbik7CiAKICAg ICBpZiAoc2NvcGVFeHRlbnNpb25PYmplY3QpCiAgICAgICAgIGdsb2JhbE9iamVjdC0+Y2xlYXJH bG9iYWxTY29wZUV4dGVuc2lvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvQ29tcGxldGlvbi5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29t cGxldGlvbi5oCmluZGV4IGUzOTkzYzMuLmYxMzFjYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0NvbXBsZXRpb24uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9Db21wbGV0aW9uLmgKQEAgLTU1LDcgKzU1LDcgQEAgaW5saW5lIEpTVmFsdWUg cHJvZmlsZWRFdmFsdWF0ZShFeGVjU3RhdGUqIGV4ZWMsIFByb2ZpbGluZ1JlYXNvbiByZWFzb24s IGNvbnN0IFMKICAgICByZXR1cm4gcHJvZmlsZWRFdmFsdWF0ZShleGVjLCByZWFzb24sIHNvdXJj ZUNvZGUsIHRoaXNWYWx1ZSwgdW51c2VkKTsKIH0KIAotSlNfRVhQT1JUX1BSSVZBVEUgSlNWYWx1 ZSBldmFsdWF0ZVdpdGhTY29wZUV4dGVuc2lvbihFeGVjU3RhdGUqLCBjb25zdCBTb3VyY2VDb2Rl JiwgSlNPYmplY3QqIHNjb3BlRXh0ZW5zaW9uKTsKK0pTX0VYUE9SVF9QUklWQVRFIEpTVmFsdWUg ZXZhbHVhdGVXaXRoU2NvcGVFeHRlbnNpb24oRXhlY1N0YXRlKiwgY29uc3QgU291cmNlQ29kZSYs IEpTT2JqZWN0KiBzY29wZUV4dGVuc2lvbiwgTmFrZWRQdHI8RXhjZXB0aW9uPiYgcmV0dXJuZWRF eGNlcHRpb24pOwogCiAvLyBMb2FkIHRoZSBtb2R1bGUgc291cmNlIGFuZCBldmFsdWF0ZSBpdC4K IEpTX0VYUE9SVF9QUklWQVRFIEpTSW50ZXJuYWxQcm9taXNlKiBsb2FkQW5kRXZhbHVhdGVNb2R1 bGUoRXhlY1N0YXRlKiwgY29uc3QgU3RyaW5nJiBtb2R1bGVOYW1lKTsK