99896 2012-10-19 18:00:40 -0700 Fix some of the regression cause by the non-local variable reworking 2012-10-19 19:33:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver webkit.review.bot oldest_to_newest 746813 0 oliver 2012-10-19 18:00:40 -0700 Fix some of the regression cause by the non-local variable reworking 746817 1 169735 oliver 2012-10-19 18:03:35 -0700 Created attachment 169735 Patch 746829 2 169735 fpizlo 2012-10-19 18:40:42 -0700 Comment on attachment 169735 Patch Looks good! 746857 3 169735 webkit.review.bot 2012-10-19 19:33:36 -0700 Comment on attachment 169735 Patch Clearing flags on attachment: 169735 Committed r131973: <http://trac.webkit.org/changeset/131973> 746858 4 webkit.review.bot 2012-10-19 19:33:39 -0700 All reviewed patches have been landed. Closing bug. 169735 2012-10-19 18:03:35 -0700 2012-10-19 19:33:36 -0700 Patch bug-99896-20121019180218.patch text/plain 5489 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxOTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 ZGI1OTQ0NTUxZWUzNzA3ZDYxZDYwMWU1YzQzYmYzNWNhNmJiODY2Li45NzA0MDFlNWM0ZmVkYTBk MmY2ZTdiNDE2M2JlZDg1ZGY3YTJjZjdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxMi0xMC0xOSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgor CisgICAgICAgIEZpeCBzb21lIG9mIHRoZSByZWdyZXNzaW9uIGNhdXNlIGJ5IHRoZSBub24tbG9j YWwgdmFyaWFibGUgcmV3b3JraW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05OTg5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBub24wbG9jYWwgdmFyaWFibGUgcmV3b3JraW5nIGxlZCB0byBzb21l IG9mIHRoZSBvcHRpbWlzYXRpb25zIHBlcmZvcm1lZCBieQorICAgICAgICB0aGUgYnl0ZWNvZGUg Z2VuZXJhdG9yIGJlaW5nIGRyb3BwZWQuICBUaGlzIGluIHR1cm4gcHV0IG1vcmUgcHJlc3N1cmUg b24gdGhlIERGRworICAgICAgICBvcHRpbWlzYXRpb25zLiAgVGhpcyBleHBvc2VkIGEgc2hvcnQg Y29taW5nIGluIG91ciBkb3VibGUgc3BlY3VsYXRpb24gcHJvcG9nYXRpb24uCisgICAgICAgIE5v dyB3ZSB0cnkgdG8gZGlzdGluZ3Vpc2ggYmV0d2VlbiBwbGFjZXMgd2hlcmUgd2Ugc2hvdWxkIFNw ZWNEb3VibGVSZWFsIHZzIGdlbmVyaWMKKyAgICAgICAgU3BlY0RvdWJsZS4KKworICAgICAgICAq IGRmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHA6CisgICAgICAgIChQcmVkaWN0 aW9uUHJvcGFnYXRpb25QaGFzZSk6CisgICAgICAgIChKU0M6OkRGRzo6UHJlZGljdGlvblByb3Bh Z2F0aW9uUGhhc2U6OnNwZWN1bGF0ZWREb3VibGVUeXBlRm9yUHJlZGljdGlvbik6CisgICAgICAg IChKU0M6OkRGRzo6UHJlZGljdGlvblByb3BhZ2F0aW9uUGhhc2U6OnNwZWN1bGF0ZWREb3VibGVU eXBlRm9yUHJlZGljdGlvbnMpOgorICAgICAgICAoSlNDOjpERkc6OlByZWRpY3Rpb25Qcm9wYWdh dGlvblBoYXNlOjpwcm9wYWdhdGUpOgorCiAyMDEyLTEwLTE5ICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGRlZCBXVEY6OlN0YWNrU3RhdHMgbWVjaGFuaXNtLgpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQcmVkaWN0aW9uUHJvcGFn YXRpb25QaGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Q cm9wYWdhdGlvblBoYXNlLmNwcAppbmRleCBmNmI3ZTU1YWVhMWY1ZDk2YmYwY2E3MTEwYzk0MDI4 ZDMxYWViZTUxLi5mZWU3YTNjYTI5ZjQ3YjcwYTMzYTZhMzgxYjVhMmM2ODhmY2RkYTUyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlv blBoYXNlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Q cm9wYWdhdGlvblBoYXNlLmNwcApAQCAtMTE2LDcgKzExNiwyMSBAQCBwcml2YXRlOgogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICByZXR1cm4gISFtX2dyYXBoLnZhbHVlT2ZOdW1i ZXJDb25zdGFudChub2RlSW5kZXgpOwogICAgIH0KLSAgICAKKworICAgIFNwZWN1bGF0ZWRUeXBl IHNwZWN1bGF0ZWREb3VibGVUeXBlRm9yUHJlZGljdGlvbihTcGVjdWxhdGVkVHlwZSB2YWx1ZSkK KyAgICB7CisgICAgICAgIGlmICghaXNOdW1iZXJTcGVjdWxhdGlvbih2YWx1ZSkpCisgICAgICAg ICAgICByZXR1cm4gU3BlY0RvdWJsZTsKKyAgICAgICAgaWYgKHZhbHVlICYgU3BlY0RvdWJsZU5h TikKKyAgICAgICAgICAgIHJldHVybiBTcGVjRG91YmxlOworICAgICAgICByZXR1cm4gU3BlY0Rv dWJsZVJlYWw7CisgICAgfQorCisgICAgU3BlY3VsYXRlZFR5cGUgc3BlY3VsYXRlZERvdWJsZVR5 cGVGb3JQcmVkaWN0aW9ucyhTcGVjdWxhdGVkVHlwZSBsZWZ0LCBTcGVjdWxhdGVkVHlwZSByaWdo dCkKKyAgICB7CisgICAgICAgIHJldHVybiBzcGVjdWxhdGVkRG91YmxlVHlwZUZvclByZWRpY3Rp b24obWVyZ2VTcGVjdWxhdGlvbnMobGVmdCwgcmlnaHQpKTsKKyAgICB9CisKICAgICB2b2lkIHBy b3BhZ2F0ZShOb2RlJiBub2RlKQogICAgIHsKICAgICAgICAgaWYgKCFub2RlLnNob3VsZEdlbmVy YXRlKCkpCkBAIC0yNDgsNyArMjYyLDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAgICAg aWYgKG1fZ3JhcGguYWRkU2hvdWxkU3BlY3VsYXRlSW50ZWdlcihub2RlKSkKICAgICAgICAgICAg ICAgICAgICAgICAgIGNoYW5nZWQgfD0gbWVyZ2VQcmVkaWN0aW9uKFNwZWNJbnQzMik7CiAgICAg ICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgICAgIGNoYW5nZWQgfD0g bWVyZ2VQcmVkaWN0aW9uKFNwZWNEb3VibGUpOworICAgICAgICAgICAgICAgICAgICAgICAgY2hh bmdlZCB8PSBtZXJnZVByZWRpY3Rpb24oc3BlY3VsYXRlZERvdWJsZVR5cGVGb3JQcmVkaWN0aW9u cyhsZWZ0LCByaWdodCkpOwogICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoIShsZWZ0ICYgU3Bl Y051bWJlcikgfHwgIShyaWdodCAmIFNwZWNOdW1iZXIpKSB7CiAgICAgICAgICAgICAgICAgICAg IC8vIGxlZnQgb3IgcmlnaHQgaXMgZGVmaW5pdGVseSBzb21ldGhpbmcgb3RoZXIgdGhhbiBhIG51 bWJlci4KICAgICAgICAgICAgICAgICAgICAgY2hhbmdlZCB8PSBtZXJnZVByZWRpY3Rpb24oU3Bl Y1N0cmluZyk7CkBAIC0yNzIsNyArMjg2LDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICBp ZiAobV9ncmFwaC5hZGRTaG91bGRTcGVjdWxhdGVJbnRlZ2VyKG5vZGUpKQogICAgICAgICAgICAg ICAgICAgICBjaGFuZ2VkIHw9IG1lcmdlUHJlZGljdGlvbihTcGVjSW50MzIpOwogICAgICAgICAg ICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgY2hhbmdlZCB8PSBtZXJnZVByZWRpY3Rp b24oU3BlY0RvdWJsZSk7CisgICAgICAgICAgICAgICAgICAgIGNoYW5nZWQgfD0gbWVyZ2VQcmVk aWN0aW9uKHNwZWN1bGF0ZWREb3VibGVUeXBlRm9yUHJlZGljdGlvbnMobGVmdCwgcmlnaHQpKTsK ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKGlzTm90TmVnWmVy byhub2RlLmNoaWxkMSgpLmluZGV4KCkpIHx8IGlzTm90TmVnWmVybyhub2RlLmNoaWxkMigpLmlu ZGV4KCkpKQpAQCAtMjkxLDcgKzMwNSw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgaWYg KG1fZ3JhcGguYWRkU2hvdWxkU3BlY3VsYXRlSW50ZWdlcihub2RlKSkKICAgICAgICAgICAgICAg ICAgICAgY2hhbmdlZCB8PSBtZXJnZVByZWRpY3Rpb24oU3BlY0ludDMyKTsKICAgICAgICAgICAg ICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIGNoYW5nZWQgfD0gbWVyZ2VQcmVkaWN0aW9u KFNwZWNEb3VibGUpOworICAgICAgICAgICAgICAgICAgICBjaGFuZ2VkIHw9IG1lcmdlUHJlZGlj dGlvbihzcGVjdWxhdGVkRG91YmxlVHlwZUZvclByZWRpY3Rpb25zKGxlZnQsIHJpZ2h0KSk7CiAg ICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmIChpc05vdFplcm8obm9kZS5jaGlsZDEoKS5p bmRleCgpKSB8fCBpc05vdFplcm8obm9kZS5jaGlsZDIoKS5pbmRleCgpKSkKQEAgLTMwNyw3ICsz MjEsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIGlmIChtX2dyYXBoLm5lZ2F0ZVNob3Vs ZFNwZWN1bGF0ZUludGVnZXIobm9kZSkpCiAgICAgICAgICAgICAgICAgICAgIGNoYW5nZWQgfD0g bWVyZ2VQcmVkaWN0aW9uKFNwZWNJbnQzMik7CiAgICAgICAgICAgICAgICAgZWxzZQotICAgICAg ICAgICAgICAgICAgICBjaGFuZ2VkIHw9IG1lcmdlUHJlZGljdGlvbihTcGVjRG91YmxlKTsKKyAg ICAgICAgICAgICAgICAgICAgY2hhbmdlZCB8PSBtZXJnZVByZWRpY3Rpb24oc3BlY3VsYXRlZERv dWJsZVR5cGVGb3JQcmVkaWN0aW9uKG1fZ3JhcGhbbm9kZS5jaGlsZDEoKV0ucHJlZGljdGlvbigp KSk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGNoYW5nZWQgfD0gbV9ncmFwaFtub2Rl LmNoaWxkMSgpXS5tZXJnZUZsYWdzKGZsYWdzKTsKQEAgLTMyMyw3ICszMzcsNyBAQCBwcml2YXRl OgogICAgICAgICAgICAgICAgICAgICAmJiBub2RlQ2FuU3BlY3VsYXRlSW50ZWdlcihub2RlLmFy aXRoTm9kZUZsYWdzKCkpKQogICAgICAgICAgICAgICAgICAgICBjaGFuZ2VkIHw9IG1lcmdlUHJl ZGljdGlvbihTcGVjSW50MzIpOwogICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAg ICAgICAgY2hhbmdlZCB8PSBtZXJnZVByZWRpY3Rpb24oU3BlY0RvdWJsZSk7CisgICAgICAgICAg ICAgICAgICAgIGNoYW5nZWQgfD0gbWVyZ2VQcmVkaWN0aW9uKHNwZWN1bGF0ZWREb3VibGVUeXBl Rm9yUHJlZGljdGlvbnMobGVmdCwgcmlnaHQpKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAg ICAgZmxhZ3MgfD0gTm9kZVVzZWRBc051bWJlcjsKQEAgLTM0MCw3ICszNTQsNyBAQCBwcml2YXRl OgogICAgICAgICAgICAgICAgIGlmIChtX2dyYXBoLm11bFNob3VsZFNwZWN1bGF0ZUludGVnZXIo bm9kZSkpCiAgICAgICAgICAgICAgICAgICAgIGNoYW5nZWQgfD0gbWVyZ2VQcmVkaWN0aW9uKFNw ZWNJbnQzMik7CiAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBjaGFu Z2VkIHw9IG1lcmdlUHJlZGljdGlvbihTcGVjRG91YmxlKTsKKyAgICAgICAgICAgICAgICAgICAg Y2hhbmdlZCB8PSBtZXJnZVByZWRpY3Rpb24oc3BlY3VsYXRlZERvdWJsZVR5cGVGb3JQcmVkaWN0 aW9ucyhsZWZ0LCByaWdodCkpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAvLyBBcyBz b29uIGFzIGEgbXVsdGlwbHkgaGFwcGVucywgd2UgY2FuIGVhc2lseSBlbmQgdXAgaW4gdGhlIHBh cnQKQEAgLTM4OCw3ICs0MDIsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgaWYgKG5vZGVDYW5T cGVjdWxhdGVJbnRlZ2VyKG5vZGUuYXJpdGhOb2RlRmxhZ3MoKSkpCiAgICAgICAgICAgICAgICAg Y2hhbmdlZCB8PSBtZXJnZVByZWRpY3Rpb24oY2hpbGQpOwogICAgICAgICAgICAgZWxzZQotICAg ICAgICAgICAgICAgIGNoYW5nZWQgfD0gc2V0UHJlZGljdGlvbihTcGVjRG91YmxlKTsKKyAgICAg ICAgICAgICAgICBjaGFuZ2VkIHw9IHNldFByZWRpY3Rpb24oc3BlY3VsYXRlZERvdWJsZVR5cGVG b3JQcmVkaWN0aW9uKGNoaWxkKSk7CiAKICAgICAgICAgICAgIGZsYWdzICY9IH5Ob2RlTmVlZHNO ZWdaZXJvOwogICAgICAgICAgICAgY2hhbmdlZCB8PSBtX2dyYXBoW25vZGUuY2hpbGQxKCldLm1l cmdlRmxhZ3MoZmxhZ3MpOwo=