120144 2013-08-21 17:44:41 -0700 Clarify var/const/function declaration 2013-08-21 18:03:43 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 919694 0 barraclough 2013-08-21 17:44:41 -0700 Add methods to JSGlobalObject to declare vars, consts, and functions. 919698 1 209317 barraclough 2013-08-21 17:56:20 -0700 Created attachment 209317 Fix 919701 2 barraclough 2013-08-21 18:03:43 -0700 Committed revision 154434. 209317 2013-08-21 17:56:20 -0700 2013-08-21 18:00:56 -0700 Fix 120144.1.patch text/plain 7706 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU0NDMwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDEzLTA4LTIxICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4K KworICAgICAgICBDbGFyaWZ5IHZhci9jb25zdC9mdW5jdGlvbiBkZWNsYXJhdGlvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwMTQ0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG1ldGhvZHMgdG8g SlNHbG9iYWxPYmplY3QgdG8gZGVjbGFyZSB2YXJzLCBjb25zdHMsIGFuZCBmdW5jdGlvbnMuCisK KyAgICAgICAgKiBydW50aW1lL0V4ZWN1dGFibGUuY3BwOgorICAgICAgICAoSlNDOjpQcm9ncmFt RXhlY3V0YWJsZTo6aW5pdGlhbGl6ZUdsb2JhbFByb3BlcnRpZXMpOgorICAgICAgICAqIHJ1bnRp bWUvRXhlY3V0YWJsZS5oOgorICAgICAgICAgICAgLSBNb3ZlZCBkZWNsYXJhdGlvbiBjb2RlIHRv IEpTR2xvYmFsT2JqZWN0CisgICAgICAgICogcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHA6Cisg ICAgICAgIChKU0M6OkpTR2xvYmFsT2JqZWN0OjphZGRHbG9iYWxWYXIpOgorICAgICAgICAgICAg LSBpbnRlcm5hbCBpbXBsZW1lbnRhdGlvbiBvZiBhZGRWYXIsIGFkZENvbnN0LCBhZGRGdW5jdGlv bgorICAgICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxPYmplY3QuaDoKKyAgICAgICAgKEpTQzo6SlNH bG9iYWxPYmplY3Q6OmFkZFZhcik6CisgICAgICAgIChKU0M6OkpTR2xvYmFsT2JqZWN0OjphZGRD b25zdCk6CisgICAgICAgIChKU0M6OkpTR2xvYmFsT2JqZWN0OjphZGRGdW5jdGlvbik6CisgICAg ICAgICAgICAtIEFkZGVkIG1ldGhvZHMgdG8gZGVjbGFyZSB2YXJzLCBjb25zdHMsIGFuZCBmdW5j dGlvbnMKKwogMjAxMy0wOC0yMSAgWWkgU2hlbiAgPG1heC5ob25nLnNoZW5AZ21haWwuY29tPgog CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk5MDAK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuY3BwCShy ZXZpc2lvbiAxNTQ0MjEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGVjdXRh YmxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzcxLDI0ICszNzEsNiBAQCB2b2lkIFByb2dyYW1F eGVjdXRhYmxlOjp1bmxpbmtDYWxscygpCiAjZW5kaWYKIH0KIAotaW50IFByb2dyYW1FeGVjdXRh YmxlOjphZGRHbG9iYWxWYXIoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgY29uc3QgSWRl bnRpZmllciYgaWRlbnQsIENvbnN0YW50TW9kZSBjb25zdGFudE1vZGUsIEZ1bmN0aW9uTW9kZSBm dW5jdGlvbk1vZGUpCi17Ci0gICAgLy8gVHJ5IHRvIHNoYXJlIHRoZSBzeW1ib2xUYWJsZSBpZiBw b3NzaWJsZQotICAgIFNoYXJlZFN5bWJvbFRhYmxlKiBzeW1ib2xUYWJsZSA9IGdsb2JhbE9iamVj dC0+c3ltYm9sVGFibGUoKTsKLSAgICBVTlVTRURfUEFSQU0oZnVuY3Rpb25Nb2RlKTsKLSAgICBD b25jdXJyZW50SklUTG9ja2VyIGxvY2tlcihzeW1ib2xUYWJsZS0+bV9sb2NrKTsKLSAgICBpbnQg aW5kZXggPSBzeW1ib2xUYWJsZS0+c2l6ZShsb2NrZXIpOwotICAgIFN5bWJvbFRhYmxlRW50cnkg bmV3RW50cnkoaW5kZXgsIChjb25zdGFudE1vZGUgPT0gSXNDb25zdGFudCkgPyBSZWFkT25seSA6 IDApOwotICAgIGlmIChmdW5jdGlvbk1vZGUgPT0gSXNGdW5jdGlvblRvU3BlY2lhbGl6ZSkKLSAg ICAgICAgbmV3RW50cnkuYXR0ZW1wdFRvV2F0Y2goKTsKLSAgICBTeW1ib2xUYWJsZTo6TWFwOjpB ZGRSZXN1bHQgcmVzdWx0ID0gc3ltYm9sVGFibGUtPmFkZChsb2NrZXIsIGlkZW50LmltcGwoKSwg bmV3RW50cnkpOwotICAgIGlmICghcmVzdWx0LmlzTmV3RW50cnkpIHsKLSAgICAgICAgcmVzdWx0 Lml0ZXJhdG9yLT52YWx1ZS5ub3RpZnlXcml0ZSgpOwotICAgICAgICBpbmRleCA9IHJlc3VsdC5p dGVyYXRvci0+dmFsdWUuZ2V0SW5kZXgoKTsKLSAgICB9Ci0gICAgcmV0dXJuIGluZGV4OwotfQot CiBKU09iamVjdCogUHJvZ3JhbUV4ZWN1dGFibGU6OmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVz KFZNJiB2bSwgQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIEpTU2NvcGUqIHNjb3BlKQogewogICAgIFJF TEVBU0VfQVNTRVJUKHNjb3BlKTsKQEAgLTQxNSwyMCArMzk3LDE2IEBAIEpTT2JqZWN0KiBQcm9n cmFtRXhlY3V0YWJsZTo6aW5pdGlhbGl6ZUcKICAgICBDYWxsRnJhbWUqIGdsb2JhbEV4ZWMgPSBn bG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKTsKIAogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg ZnVuY3Rpb25EZWNsYXJhdGlvbnMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgYm9vbCBwcm9wZXJ0 eURpZEV4aXN0ID0gZ2xvYmFsT2JqZWN0LT5yZW1vdmVEaXJlY3Qodm0sIGZ1bmN0aW9uRGVjbGFy YXRpb25zW2ldLmZpcnN0KTsgLy8gTmV3bHkgZGVjbGFyZWQgZnVuY3Rpb25zIG92ZXJ3cml0ZSBl eGlzdGluZyBwcm9wZXJ0aWVzLgogICAgICAgICBVbmxpbmtlZEZ1bmN0aW9uRXhlY3V0YWJsZSog dW5saW5rZWRGdW5jdGlvbkV4ZWN1dGFibGUgPSBmdW5jdGlvbkRlY2xhcmF0aW9uc1tpXS5zZWNv bmQuZ2V0KCk7CiAgICAgICAgIEpTVmFsdWUgdmFsdWUgPSBKU0Z1bmN0aW9uOjpjcmVhdGUoZ2xv YmFsRXhlYywgdW5saW5rZWRGdW5jdGlvbkV4ZWN1dGFibGUtPmxpbmsodm0sIG1fc291cmNlLCBs aW5lTm8oKSwgMCksIHNjb3BlKTsKLSAgICAgICAgaW50IGluZGV4ID0gYWRkR2xvYmFsVmFyKGds b2JhbE9iamVjdCwgZnVuY3Rpb25EZWNsYXJhdGlvbnNbaV0uZmlyc3QsIElzVmFyaWFibGUsCi0g ICAgICAgICAgICAhcHJvcGVydHlEaWRFeGlzdCA/IElzRnVuY3Rpb25Ub1NwZWNpYWxpemUgOiBO b3RGdW5jdGlvbk9yTm90U3BlY2lhbGl6YWJsZSk7Ci0gICAgICAgIGdsb2JhbE9iamVjdC0+cmVn aXN0ZXJBdChpbmRleCkuc2V0KHZtLCBnbG9iYWxPYmplY3QsIHZhbHVlKTsKKyAgICAgICAgZ2xv YmFsT2JqZWN0LT5hZGRGdW5jdGlvbihjYWxsRnJhbWUsIGZ1bmN0aW9uRGVjbGFyYXRpb25zW2ld LmZpcnN0LCB2YWx1ZSk7CiAgICAgfQogCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB2YXJp YWJsZURlY2xhcmF0aW9ucy5zaXplKCk7ICsraSkgewotICAgICAgICBpZiAoZ2xvYmFsT2JqZWN0 LT5oYXNQcm9wZXJ0eShnbG9iYWxFeGVjLCB2YXJpYWJsZURlY2xhcmF0aW9uc1tpXS5maXJzdCkp Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgYWRkR2xvYmFsVmFyKGdsb2JhbE9iamVj dCwgdmFyaWFibGVEZWNsYXJhdGlvbnNbaV0uZmlyc3QsCi0gICAgICAgICAgICAodmFyaWFibGVE ZWNsYXJhdGlvbnNbaV0uc2Vjb25kICYgRGVjbGFyYXRpb25TdGFja3M6OklzQ29uc3RhbnQpID8g SXNDb25zdGFudCA6IElzVmFyaWFibGUsCi0gICAgICAgICAgICBOb3RGdW5jdGlvbk9yTm90U3Bl Y2lhbGl6YWJsZSk7CisgICAgICAgIGlmICh2YXJpYWJsZURlY2xhcmF0aW9uc1tpXS5zZWNvbmQg JiBEZWNsYXJhdGlvblN0YWNrczo6SXNDb25zdGFudCkKKyAgICAgICAgICAgIGdsb2JhbE9iamVj dC0+YWRkQ29uc3QoY2FsbEZyYW1lLCB2YXJpYWJsZURlY2xhcmF0aW9uc1tpXS5maXJzdCk7Cisg ICAgICAgIGVsc2UKKyAgICAgICAgICAgIGdsb2JhbE9iamVjdC0+YWRkVmFyKGNhbGxGcmFtZSwg dmFyaWFibGVEZWNsYXJhdGlvbnNbaV0uZmlyc3QpOwogICAgIH0KICAgICByZXR1cm4gMDsKIH0K SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGVjdXRhYmxlLmgJKHJldmlz aW9uIDE1NDQyMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUu aAkod29ya2luZyBjb3B5KQpAQCAtNTYxLDEwICs1NjEsNiBAQCBuYW1lc3BhY2UgSlNDIHsKIAog ICAgICAgICBQcm9ncmFtRXhlY3V0YWJsZShFeGVjU3RhdGUqLCBjb25zdCBTb3VyY2VDb2RlJik7 CiAKLSAgICAgICAgZW51bSBDb25zdGFudE1vZGUgeyBJc0NvbnN0YW50LCBJc1ZhcmlhYmxlIH07 Ci0gICAgICAgIGVudW0gRnVuY3Rpb25Nb2RlIHsgSXNGdW5jdGlvblRvU3BlY2lhbGl6ZSwgTm90 RnVuY3Rpb25Pck5vdFNwZWNpYWxpemFibGUgfTsKLSAgICAgICAgaW50IGFkZEdsb2JhbFZhcihK U0dsb2JhbE9iamVjdCosIGNvbnN0IElkZW50aWZpZXImLCBDb25zdGFudE1vZGUsIEZ1bmN0aW9u TW9kZSk7Ci0KICAgICAgICAgSlNPYmplY3QqIGNvbXBpbGVJbnRlcm5hbChFeGVjU3RhdGUqLCBK U1Njb3BlKiwgSklUQ29kZTo6SklUVHlwZSwgQ29tcGlsYXRpb25SZXN1bHQqID0gMCwgdW5zaWdu ZWQgYnl0ZWNvZGVJbmRleCA9IFVJTlRfTUFYKTsKICAgICAgICAgc3RhdGljIHZvaWQgdmlzaXRD aGlsZHJlbihKU0NlbGwqLCBTbG90VmlzaXRvciYpOwogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwCShyZXZpc2lvbiAxNTQ0MjIp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE5Niw2ICsxOTYsMjAgQEAgYm9vbCBKU0dsb2JhbE9iamVjdDo6ZGVm aW5lT3duUHJvcGVydHkoSgogICAgIHJldHVybiBCYXNlOjpkZWZpbmVPd25Qcm9wZXJ0eSh0aGlz T2JqZWN0LCBleGVjLCBwcm9wZXJ0eU5hbWUsIGRlc2NyaXB0b3IsIHNob3VsZFRocm93KTsKIH0K IAoraW50IEpTR2xvYmFsT2JqZWN0OjphZGRHbG9iYWxWYXIoY29uc3QgSWRlbnRpZmllciYgaWRl bnQsIENvbnN0YW50TW9kZSBjb25zdGFudE1vZGUsIEZ1bmN0aW9uTW9kZSBmdW5jdGlvbk1vZGUp Cit7CisgICAgQ29uY3VycmVudEpJVExvY2tlciBsb2NrZXIoc3ltYm9sVGFibGUoKS0+bV9sb2Nr KTsKKyAgICBpbnQgaW5kZXggPSBzeW1ib2xUYWJsZSgpLT5zaXplKGxvY2tlcik7CisgICAgU3lt Ym9sVGFibGVFbnRyeSBuZXdFbnRyeShpbmRleCwgKGNvbnN0YW50TW9kZSA9PSBJc0NvbnN0YW50 KSA/IFJlYWRPbmx5IDogMCk7CisgICAgaWYgKGZ1bmN0aW9uTW9kZSA9PSBJc0Z1bmN0aW9uVG9T cGVjaWFsaXplKQorICAgICAgICBuZXdFbnRyeS5hdHRlbXB0VG9XYXRjaCgpOworICAgIFN5bWJv bFRhYmxlOjpNYXA6OkFkZFJlc3VsdCByZXN1bHQgPSBzeW1ib2xUYWJsZSgpLT5hZGQobG9ja2Vy LCBpZGVudC5pbXBsKCksIG5ld0VudHJ5KTsKKyAgICBpZiAoIXJlc3VsdC5pc05ld0VudHJ5KSB7 CisgICAgICAgIHJlc3VsdC5pdGVyYXRvci0+dmFsdWUubm90aWZ5V3JpdGUoKTsKKyAgICAgICAg aW5kZXggPSByZXN1bHQuaXRlcmF0b3ItPnZhbHVlLmdldEluZGV4KCk7CisgICAgfQorICAgIHJl dHVybiBpbmRleDsKK30KIAogc3RhdGljIGlubGluZSBKU09iamVjdCogbGFzdEluUHJvdG90eXBl Q2hhaW4oSlNPYmplY3QqIG9iamVjdCkKIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTR2xvYmFsT2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuaAkocmV2aXNpb24gMTU0NDIyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuaAkod29ya2luZyBjb3B5KQpA QCAtMjM5LDYgKzIzOSwxMCBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIGluaXQodGhpc1ZhbHVlKTsK ICAgICB9CiAKKyAgICBlbnVtIENvbnN0YW50TW9kZSB7IElzQ29uc3RhbnQsIElzVmFyaWFibGUg fTsKKyAgICBlbnVtIEZ1bmN0aW9uTW9kZSB7IElzRnVuY3Rpb25Ub1NwZWNpYWxpemUsIE5vdEZ1 bmN0aW9uT3JOb3RTcGVjaWFsaXphYmxlIH07CisgICAgaW50IGFkZEdsb2JhbFZhcihjb25zdCBJ ZGVudGlmaWVyJiwgQ29uc3RhbnRNb2RlLCBGdW5jdGlvbk1vZGUpOworCiBwdWJsaWM6CiAgICAg SlNfRVhQT1JUX1BSSVZBVEUgfkpTR2xvYmFsT2JqZWN0KCk7CiAgICAgSlNfRVhQT1JUX1BSSVZB VEUgc3RhdGljIHZvaWQgZGVzdHJveShKU0NlbGwqKTsKQEAgLTI2MSw2ICsyNjUsMjMgQEAgcHVi bGljOgogICAgIC8vIGxvb2t1cHMgcHJpb3IgdG8gaW5pdGlhbGl6aW5nIHRoZSBwcm9wZXJ0aWVz CiAgICAgYm9vbCBzeW1ib2xUYWJsZUhhc1Byb3BlcnR5KFByb3BlcnR5TmFtZSk7CiAKKyAgICB2 b2lkIGFkZFZhcihFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFt ZSkKKyAgICB7CisgICAgICAgIGlmICghaGFzUHJvcGVydHkoZXhlYywgcHJvcGVydHlOYW1lKSkK KyAgICAgICAgICAgIGFkZEdsb2JhbFZhcihwcm9wZXJ0eU5hbWUsIElzVmFyaWFibGUsIE5vdEZ1 bmN0aW9uT3JOb3RTcGVjaWFsaXphYmxlKTsKKyAgICB9CisgICAgdm9pZCBhZGRDb25zdChFeGVj U3RhdGUqIGV4ZWMsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSkKKyAgICB7CisgICAg ICAgIGlmICghaGFzUHJvcGVydHkoZXhlYywgcHJvcGVydHlOYW1lKSkKKyAgICAgICAgICAgIGFk ZEdsb2JhbFZhcihwcm9wZXJ0eU5hbWUsIElzQ29uc3RhbnQsIE5vdEZ1bmN0aW9uT3JOb3RTcGVj aWFsaXphYmxlKTsKKyAgICB9CisgICAgdm9pZCBhZGRGdW5jdGlvbihFeGVjU3RhdGUqIGV4ZWMs IGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgSlNWYWx1ZSB2YWx1ZSkKKyAgICB7Cisg ICAgICAgIGJvb2wgcHJvcGVydHlEaWRFeGlzdCA9IHJlbW92ZURpcmVjdChleGVjLT52bSgpLCBw cm9wZXJ0eU5hbWUpOyAvLyBOZXdseSBkZWNsYXJlZCBmdW5jdGlvbnMgb3ZlcndyaXRlIGV4aXN0 aW5nIHByb3BlcnRpZXMuCisgICAgICAgIGludCBpbmRleCA9IGFkZEdsb2JhbFZhcihwcm9wZXJ0 eU5hbWUsIElzVmFyaWFibGUsICFwcm9wZXJ0eURpZEV4aXN0ID8gSXNGdW5jdGlvblRvU3BlY2lh bGl6ZSA6IE5vdEZ1bmN0aW9uT3JOb3RTcGVjaWFsaXphYmxlKTsKKyAgICAgICAgcmVnaXN0ZXJB dChpbmRleCkuc2V0KGV4ZWMtPnZtKCksIHRoaXMsIHZhbHVlKTsKKyAgICB9CisKICAgICAvLyBU aGUgZm9sbG93aW5nIGFjY2Vzc29ycyByZXR1cm4gcHJpc3RpbmUgdmFsdWVzLCBldmVuIGlmIGEg c2NyaXB0IAogICAgIC8vIHJlcGxhY2VzIHRoZSBnbG9iYWwgb2JqZWN0J3MgYXNzb2NpYXRlZCBw cm9wZXJ0eS4KIAo=