37229 2010-04-07 12:50:07 -0700 Remove some unnecessary uses of commonJSGlobalData 2010-04-07 13:38:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 oliver webkit-unassigned oldest_to_newest 209786 0 oliver 2010-04-07 12:50:07 -0700 Remove some unnecessary uses of commonJSGlobalData 209788 1 52772 oliver 2010-04-07 12:51:58 -0700 Created attachment 52772 Patch 209812 2 oliver 2010-04-07 13:38:11 -0700 Committed r57227: <http://trac.webkit.org/changeset/57227> 52772 2010-04-07 12:51:58 -0700 2010-04-07 12:53:37 -0700 Patch bug-37229-20100407125157.patch text/plain 6550 oliver ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NmUyNTdmNC4uZjg3Njk5MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNC0wNyAgT2xpdmVyIEh1bnQg IDxvbGl2ZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJlbW92ZSBzb21lIHVubmVjZXNzYXJ5IHVzZXMgb2YgY29tbW9uSlNHbG9i YWxEYXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z NzIyOQorCisgICAgICAgIFBhc3MgdGhlIEV4ZWNTdGF0ZSBkb3duIHRvIGlkZW50aWZpZXJGcm9t TlBJZGVudGlmaWVyIGFuZCB1cGRhdGUgY2FsbCBzaXRlcworCisgICAgICAgICogYnJpZGdlL05Q X2pzb2JqZWN0LmNwcDoKKyAgICAgICAgKF9OUE5fSW52b2tlKToKKyAgICAgICAgKF9OUE5fR2V0 UHJvcGVydHkpOgorICAgICAgICAoX05QTl9TZXRQcm9wZXJ0eSk6CisgICAgICAgIChfTlBOX1Jl bW92ZVByb3BlcnR5KToKKyAgICAgICAgKF9OUE5fSGFzUHJvcGVydHkpOgorICAgICAgICAoX05Q Tl9IYXNNZXRob2QpOgorICAgICAgICAqIGJyaWRnZS9jL2NfaW5zdGFuY2UuY3BwOgorICAgICAg ICAoSlNDOjpCaW5kaW5nczo6Q0luc3RhbmNlOjpnZXRQcm9wZXJ0eU5hbWVzKToKKyAgICAgICAg KiBicmlkZ2UvYy9jX3V0aWxpdHkuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6aWRlbnRp ZmllckZyb21OUElkZW50aWZpZXIpOgorICAgICAgICAqIGJyaWRnZS9jL2NfdXRpbGl0eS5oOgor CiAyMDEwLTA0LTA2ICBDaHJpcyBFdmFucyAgPGNldmFuc0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYnJpZGdlL05Q X2pzb2JqZWN0LmNwcCBiL1dlYkNvcmUvYnJpZGdlL05QX2pzb2JqZWN0LmNwcAppbmRleCA0YWZj ZDVjLi5kOTgzZjZhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JyaWRnZS9OUF9qc29iamVjdC5jcHAK KysrIGIvV2ViQ29yZS9icmlkZ2UvTlBfanNvYmplY3QuY3BwCkBAIC0yMzAsNyArMjMwLDcgQEAg Ym9vbCBfTlBOX0ludm9rZShOUFAgbnBwLCBOUE9iamVjdCogbywgTlBJZGVudGlmaWVyIG1ldGhv ZE5hbWUsIGNvbnN0IE5QVmFyaWFudCoKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAg ICAgRXhlY1N0YXRlKiBleGVjID0gcm9vdE9iamVjdC0+Z2xvYmFsT2JqZWN0KCktPmdsb2JhbEV4 ZWMoKTsKICAgICAgICAgSlNMb2NrIGxvY2soU2lsZW5jZUFzc2VydGlvbnNPbmx5KTsKLSAgICAg ICAgSlNWYWx1ZSBmdW5jdGlvbiA9IG9iai0+aW1wLT5nZXQoZXhlYywgaWRlbnRpZmllckZyb21O UElkZW50aWZpZXIoaS0+c3RyaW5nKCkpKTsKKyAgICAgICAgSlNWYWx1ZSBmdW5jdGlvbiA9IG9i ai0+aW1wLT5nZXQoZXhlYywgaWRlbnRpZmllckZyb21OUElkZW50aWZpZXIoZXhlYywgaS0+c3Ry aW5nKCkpKTsKICAgICAgICAgQ2FsbERhdGEgY2FsbERhdGE7CiAgICAgICAgIENhbGxUeXBlIGNh bGxUeXBlID0gZnVuY3Rpb24uZ2V0Q2FsbERhdGEoY2FsbERhdGEpOwogICAgICAgICBpZiAoY2Fs bFR5cGUgPT0gQ2FsbFR5cGVOb25lKQpAQCAtMzExLDcgKzMxMSw3IEBAIGJvb2wgX05QTl9HZXRQ cm9wZXJ0eShOUFAsIE5QT2JqZWN0KiBvLCBOUElkZW50aWZpZXIgcHJvcGVydHlOYW1lLCBOUFZh cmlhbnQqIHZhCiAgICAgICAgIEpTTG9jayBsb2NrKFNpbGVuY2VBc3NlcnRpb25zT25seSk7CiAg ICAgICAgIEpTVmFsdWUgcmVzdWx0OwogICAgICAgICBpZiAoaS0+aXNTdHJpbmcoKSkKLSAgICAg ICAgICAgIHJlc3VsdCA9IG9iai0+aW1wLT5nZXQoZXhlYywgaWRlbnRpZmllckZyb21OUElkZW50 aWZpZXIoaS0+c3RyaW5nKCkpKTsKKyAgICAgICAgICAgIHJlc3VsdCA9IG9iai0+aW1wLT5nZXQo ZXhlYywgaWRlbnRpZmllckZyb21OUElkZW50aWZpZXIoZXhlYywgaS0+c3RyaW5nKCkpKTsKICAg ICAgICAgZWxzZQogICAgICAgICAgICAgcmVzdWx0ID0gb2JqLT5pbXAtPmdldChleGVjLCBpLT5u dW1iZXIoKSk7CiAKQEAgLTM0NSw3ICszNDUsNyBAQCBib29sIF9OUE5fU2V0UHJvcGVydHkoTlBQ LCBOUE9iamVjdCogbywgTlBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSwgY29uc3QgTlBWYXJpYQog CiAgICAgICAgIGlmIChpLT5pc1N0cmluZygpKSB7CiAgICAgICAgICAgICBQdXRQcm9wZXJ0eVNs b3Qgc2xvdDsKLSAgICAgICAgICAgIG9iai0+aW1wLT5wdXQoZXhlYywgaWRlbnRpZmllckZyb21O UElkZW50aWZpZXIoaS0+c3RyaW5nKCkpLCBjb252ZXJ0TlBWYXJpYW50VG9WYWx1ZShleGVjLCB2 YXJpYW50LCByb290T2JqZWN0KSwgc2xvdCk7CisgICAgICAgICAgICBvYmotPmltcC0+cHV0KGV4 ZWMsIGlkZW50aWZpZXJGcm9tTlBJZGVudGlmaWVyKGV4ZWMsIGktPnN0cmluZygpKSwgY29udmVy dE5QVmFyaWFudFRvVmFsdWUoZXhlYywgdmFyaWFudCwgcm9vdE9iamVjdCksIHNsb3QpOwogICAg ICAgICB9IGVsc2UKICAgICAgICAgICAgIG9iai0+aW1wLT5wdXQoZXhlYywgaS0+bnVtYmVyKCks IGNvbnZlcnROUFZhcmlhbnRUb1ZhbHVlKGV4ZWMsIHZhcmlhbnQsIHJvb3RPYmplY3QpKTsKICAg ICAgICAgZXhlYy0+Y2xlYXJFeGNlcHRpb24oKTsKQEAgLTM3MCw3ICszNzAsNyBAQCBib29sIF9O UE5fUmVtb3ZlUHJvcGVydHkoTlBQLCBOUE9iamVjdCogbywgTlBJZGVudGlmaWVyIHByb3BlcnR5 TmFtZSkKICAgICAgICAgRXhlY1N0YXRlKiBleGVjID0gcm9vdE9iamVjdC0+Z2xvYmFsT2JqZWN0 KCktPmdsb2JhbEV4ZWMoKTsKICAgICAgICAgSWRlbnRpZmllclJlcCogaSA9IHN0YXRpY19jYXN0 PElkZW50aWZpZXJSZXAqPihwcm9wZXJ0eU5hbWUpOwogICAgICAgICBpZiAoaS0+aXNTdHJpbmco KSkgewotICAgICAgICAgICAgaWYgKCFvYmotPmltcC0+aGFzUHJvcGVydHkoZXhlYywgaWRlbnRp ZmllckZyb21OUElkZW50aWZpZXIoaS0+c3RyaW5nKCkpKSkgeworICAgICAgICAgICAgaWYgKCFv YmotPmltcC0+aGFzUHJvcGVydHkoZXhlYywgaWRlbnRpZmllckZyb21OUElkZW50aWZpZXIoZXhl YywgaS0+c3RyaW5nKCkpKSkgewogICAgICAgICAgICAgICAgIGV4ZWMtPmNsZWFyRXhjZXB0aW9u KCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQpAQCAtMzgz LDcgKzM4Myw3IEBAIGJvb2wgX05QTl9SZW1vdmVQcm9wZXJ0eShOUFAsIE5QT2JqZWN0KiBvLCBO UElkZW50aWZpZXIgcHJvcGVydHlOYW1lKQogCiAgICAgICAgIEpTTG9jayBsb2NrKFNpbGVuY2VB c3NlcnRpb25zT25seSk7CiAgICAgICAgIGlmIChpLT5pc1N0cmluZygpKQotICAgICAgICAgICAg b2JqLT5pbXAtPmRlbGV0ZVByb3BlcnR5KGV4ZWMsIGlkZW50aWZpZXJGcm9tTlBJZGVudGlmaWVy KGktPnN0cmluZygpKSk7CisgICAgICAgICAgICBvYmotPmltcC0+ZGVsZXRlUHJvcGVydHkoZXhl YywgaWRlbnRpZmllckZyb21OUElkZW50aWZpZXIoZXhlYywgaS0+c3RyaW5nKCkpKTsKICAgICAg ICAgZWxzZQogICAgICAgICAgICAgb2JqLT5pbXAtPmRlbGV0ZVByb3BlcnR5KGV4ZWMsIGktPm51 bWJlcigpKTsKIApAQCAtNDA2LDcgKzQwNiw3IEBAIGJvb2wgX05QTl9IYXNQcm9wZXJ0eShOUFAs IE5QT2JqZWN0KiBvLCBOUElkZW50aWZpZXIgcHJvcGVydHlOYW1lKQogICAgICAgICBJZGVudGlm aWVyUmVwKiBpID0gc3RhdGljX2Nhc3Q8SWRlbnRpZmllclJlcCo+KHByb3BlcnR5TmFtZSk7CiAg ICAgICAgIEpTTG9jayBsb2NrKFNpbGVuY2VBc3NlcnRpb25zT25seSk7CiAgICAgICAgIGlmIChp LT5pc1N0cmluZygpKSB7Ci0gICAgICAgICAgICBib29sIHJlc3VsdCA9IG9iai0+aW1wLT5oYXNQ cm9wZXJ0eShleGVjLCBpZGVudGlmaWVyRnJvbU5QSWRlbnRpZmllcihpLT5zdHJpbmcoKSkpOwor ICAgICAgICAgICAgYm9vbCByZXN1bHQgPSBvYmotPmltcC0+aGFzUHJvcGVydHkoZXhlYywgaWRl bnRpZmllckZyb21OUElkZW50aWZpZXIoZXhlYywgaS0+c3RyaW5nKCkpKTsKICAgICAgICAgICAg IGV4ZWMtPmNsZWFyRXhjZXB0aW9uKCk7CiAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OwogICAg ICAgICB9CkBAIC00MzcsNyArNDM3LDcgQEAgYm9vbCBfTlBOX0hhc01ldGhvZChOUFAsIE5QT2Jq ZWN0KiBvLCBOUElkZW50aWZpZXIgbWV0aG9kTmFtZSkKIAogICAgICAgICBFeGVjU3RhdGUqIGV4 ZWMgPSByb290T2JqZWN0LT5nbG9iYWxPYmplY3QoKS0+Z2xvYmFsRXhlYygpOwogICAgICAgICBK U0xvY2sgbG9jayhTaWxlbmNlQXNzZXJ0aW9uc09ubHkpOwotICAgICAgICBKU1ZhbHVlIGZ1bmMg PSBvYmotPmltcC0+Z2V0KGV4ZWMsIGlkZW50aWZpZXJGcm9tTlBJZGVudGlmaWVyKGktPnN0cmlu ZygpKSk7CisgICAgICAgIEpTVmFsdWUgZnVuYyA9IG9iai0+aW1wLT5nZXQoZXhlYywgaWRlbnRp ZmllckZyb21OUElkZW50aWZpZXIoZXhlYywgaS0+c3RyaW5nKCkpKTsKICAgICAgICAgZXhlYy0+ Y2xlYXJFeGNlcHRpb24oKTsKICAgICAgICAgcmV0dXJuICFmdW5jLmlzVW5kZWZpbmVkKCk7CiAg ICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvYy9jX2luc3RhbmNlLmNwcCBiL1dlYkNv cmUvYnJpZGdlL2MvY19pbnN0YW5jZS5jcHAKaW5kZXggMmFkYjMyMi4uN2RiYzFkOSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9icmlkZ2UvYy9jX2luc3RhbmNlLmNwcAorKysgYi9XZWJDb3JlL2JyaWRn ZS9jL2NfaW5zdGFuY2UuY3BwCkBAIC0zMDMsNyArMzAzLDcgQEAgdm9pZCBDSW5zdGFuY2U6Omdl dFByb3BlcnR5TmFtZXMoRXhlY1N0YXRlKiBleGVjLCBQcm9wZXJ0eU5hbWVBcnJheSYgbmFtZUFy cmF5KQogICAgICAgICBJZGVudGlmaWVyUmVwKiBpZGVudGlmaWVyID0gc3RhdGljX2Nhc3Q8SWRl bnRpZmllclJlcCo+KGlkZW50aWZpZXJzW2ldKTsKIAogICAgICAgICBpZiAoaWRlbnRpZmllci0+ aXNTdHJpbmcoKSkKLSAgICAgICAgICAgIG5hbWVBcnJheS5hZGQoaWRlbnRpZmllckZyb21OUElk ZW50aWZpZXIoaWRlbnRpZmllci0+c3RyaW5nKCkpKTsKKyAgICAgICAgICAgIG5hbWVBcnJheS5h ZGQoaWRlbnRpZmllckZyb21OUElkZW50aWZpZXIoZXhlYywgaWRlbnRpZmllci0+c3RyaW5nKCkp KTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgbmFtZUFycmF5LmFkZChJZGVudGlmaWVyOjpm cm9tKGV4ZWMsIGlkZW50aWZpZXItPm51bWJlcigpKSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9icmlkZ2UvYy9jX3V0aWxpdHkuY3BwIGIvV2ViQ29yZS9icmlkZ2UvYy9jX3V0aWxpdHku Y3BwCmluZGV4IDhkMTE5NWEuLmE2N2NhYTggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYnJpZGdlL2Mv Y191dGlsaXR5LmNwcAorKysgYi9XZWJDb3JlL2JyaWRnZS9jL2NfdXRpbGl0eS5jcHAKQEAgLTE0 Myw5ICsxNDMsOSBAQCBTdHJpbmcgY29udmVydE5QU3RyaW5nVG9VVEYxNihjb25zdCBOUFN0cmlu Zyogc3RyaW5nKQogICAgIHJldHVybiBTdHJpbmc6OmZyb21VVEY4V2l0aExhdGluMUZhbGxiYWNr KHN0cmluZy0+VVRGOENoYXJhY3RlcnMsIHN0cmluZy0+VVRGOExlbmd0aCk7CiB9CiAKLUlkZW50 aWZpZXIgaWRlbnRpZmllckZyb21OUElkZW50aWZpZXIoY29uc3QgTlBVVEY4KiBuYW1lKQorSWRl bnRpZmllciBpZGVudGlmaWVyRnJvbU5QSWRlbnRpZmllcihFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0 IE5QVVRGOCogbmFtZSkKIHsKLSAgICByZXR1cm4gSWRlbnRpZmllcihXZWJDb3JlOjpKU0RPTVdp bmRvdzo6Y29tbW9uSlNHbG9iYWxEYXRhKCksIGNvbnZlcnRVVEY4VG9VVEYxNldpdGhMYXRpbjFG YWxsYmFjayhuYW1lLCAtMSkpOworICAgIHJldHVybiBJZGVudGlmaWVyKGV4ZWMsIGNvbnZlcnRV VEY4VG9VVEYxNldpdGhMYXRpbjFGYWxsYmFjayhuYW1lLCAtMSkpOwogfQogCiB9IH0KZGlmZiAt LWdpdCBhL1dlYkNvcmUvYnJpZGdlL2MvY191dGlsaXR5LmggYi9XZWJDb3JlL2JyaWRnZS9jL2Nf dXRpbGl0eS5oCmluZGV4IGY2OWJiYTYuLjZhZjhmYjYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYnJp ZGdlL2MvY191dGlsaXR5LmgKKysrIGIvV2ViQ29yZS9icmlkZ2UvYy9jX3V0aWxpdHkuaApAQCAt NDksNyArNDksNyBAQCB0eXBlZGVmIHVpbnQxNl90IE5QVVRGMTY7CiBXZWJDb3JlOjpTdHJpbmcg Y29udmVydE5QU3RyaW5nVG9VVEYxNihjb25zdCBOUFN0cmluZyAqc3RyaW5nKTsKIHZvaWQgY29u dmVydFZhbHVlVG9OUFZhcmlhbnQoRXhlY1N0YXRlKiwgSlNWYWx1ZSwgTlBWYXJpYW50KiByZXN1 bHQpOwogSlNWYWx1ZSBjb252ZXJ0TlBWYXJpYW50VG9WYWx1ZShFeGVjU3RhdGUqLCBjb25zdCBO UFZhcmlhbnQqLCBSb290T2JqZWN0Kik7Ci1JZGVudGlmaWVyIGlkZW50aWZpZXJGcm9tTlBJZGVu dGlmaWVyKGNvbnN0IE5QVVRGOCogbmFtZSk7CitJZGVudGlmaWVyIGlkZW50aWZpZXJGcm9tTlBJ ZGVudGlmaWVyKEV4ZWNTdGF0ZSosIGNvbnN0IE5QVVRGOCogbmFtZSk7CiAKIH0gfQogCg==