109786 2013-02-13 23:02:48 -0800 [V8] Remove GenerateEventListenerCallback() from CodeGeneratorV8.pm 2013-02-14 16:19:34 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 832747 0 haraken 2013-02-13 23:02:48 -0800 Some code is duplicated between GenerateEventListenerCallback() and GenerateFunctionCallback(). By inlining GenerateEventListenerCallback() into GenerateFunctionCallback(), we can remove the duplication. 832748 1 188265 haraken 2013-02-13 23:04:06 -0800 Created attachment 188265 Patch 833528 2 188265 webkit.review.bot 2013-02-14 16:19:31 -0800 Comment on attachment 188265 Patch Clearing flags on attachment: 188265 Committed r142934: <http://trac.webkit.org/changeset/142934> 833529 3 webkit.review.bot 2013-02-14 16:19:34 -0800 All reviewed patches have been landed. Closing bug. 188265 2013-02-13 23:04:06 -0800 2013-02-14 16:19:31 -0800 Patch bug-109786-20130214160034.patch text/plain 5513 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyODQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjc1Y2IzYjYxMzgyYTk1 MGY1MTNlYzZmMzE3MTgwNjZmMmRhNWVjZC4uZjBkM2RiMjM3YTU1NGFjNGNjMjc5ZTRlZmNlZGMw NDMyMGQwNGYzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEzLTAyLTEzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBbVjhdIFJlbW92ZSBH ZW5lcmF0ZUV2ZW50TGlzdGVuZXJDYWxsYmFjaygpIGZyb20gQ29kZUdlbmVyYXRvclY4LnBtCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk3ODYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTb21lIGNvZGUg aXMgZHVwbGljYXRlZCBiZXR3ZWVuIEdlbmVyYXRlRXZlbnRMaXN0ZW5lckNhbGxiYWNrKCkKKyAg ICAgICAgYW5kIEdlbmVyYXRlRnVuY3Rpb25DYWxsYmFjaygpLiBCeSBpbmxpbmluZyBHZW5lcmF0 ZUV2ZW50TGlzdGVuZXJDYWxsYmFjaygpCisgICAgICAgIGludG8gR2VuZXJhdGVGdW5jdGlvbkNh bGxiYWNrKCksIHdlIGNhbiByZW1vdmUgdGhlIGR1cGxpY2F0aW9uLgorCisgICAgICAgIE5vIHRl c3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRz L0NvZGVHZW5lcmF0b3JWOC5wbToKKyAgICAgICAgKEdlbmVyYXRlRnVuY3Rpb25DYWxsYmFjayk6 CisKKzIwMTMtMDItMTMgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgorCiAg ICAgICAgIFtWOF0gR2VuZXJhdGUgd3JhcHBlciBtZXRob2RzIGZvciBjdXN0b20gbWV0aG9kcwog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5Njc4CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv clY4LnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgu cG0KaW5kZXggMDVmNjU4OWM3YWZiZDVjNWI3NDQyMWY4ZDAyYTczMTZlZDIwYzAzMS4uYjY0NjE3 ZWRhZWEyY2YyMDI4MTA0YTI1MDE4OTc3MzI3YTE0ZmYzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KQEAgLTEzNjksNDkgKzEz NjksNiBAQCBFTkQKICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiI2VuZGlmIC8vICR7Y29u ZGl0aW9uYWxTdHJpbmd9XG5cbiIpIGlmICRjb25kaXRpb25hbFN0cmluZzsKIH0KIAotc3ViIEdl bmVyYXRlRXZlbnRMaXN0ZW5lckNhbGxiYWNrCi17Ci0gICAgbXkgJGludGVyZmFjZU5hbWUgPSBz aGlmdDsKLSAgICBteSAkcmVxdWlyZXNIaWRkZW5EZXBlbmRlbmN5ID0gc2hpZnQ7Ci0gICAgbXkg JGZ1bmN0aW9uID0gc2hpZnQ7Ci0gICAgbXkgJG5hbWUgPSAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ bmFtZTsKLSAgICBteSAkbG9va3VwVHlwZSA9ICgkbmFtZSBlcSAiYWRkRXZlbnRMaXN0ZW5lciIp ID8gIk9yQ3JlYXRlIiA6ICJPbmx5IjsKLSAgICBteSAkcGFzc1JlZlB0ckhhbmRsaW5nID0gKCRu YW1lIGVxICJhZGRFdmVudExpc3RlbmVyIikgPyAiIiA6ICIuZ2V0KCkiOwotICAgIG15ICRoaWRk ZW5EZXBlbmRlbmN5QWN0aW9uID0gKCRuYW1lIGVxICJhZGRFdmVudExpc3RlbmVyIikgPyAiY3Jl YXRlIiA6ICJyZW1vdmUiOwotCi0gICAgQWRkVG9JbXBsSW5jbHVkZXMoIlY4RXZlbnRMaXN0ZW5l ckxpc3QuaCIpOwotICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsIDw8RU5EKTsKLXN0YXRpYyB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gJHtuYW1lfUNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMm IGFyZ3MpCi17Ci1FTkQKLSAgICBpZiAoSGFzQ3VzdG9tTWV0aG9kKCRmdW5jdGlvbi0+c2lnbmF0 dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMpKSB7Ci0gICAgICAgIHB1c2goQGltcGxDb250ZW50RGVj bHMsIDw8RU5EKTsKLSAgICByZXR1cm4gVjgke2ludGVyZmFjZU5hbWV9Ojoke25hbWV9Q2FsbGJh Y2tDdXN0b20oYXJncyk7Ci19Ci0KLUVORAotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAg cHVzaChAaW1wbENvbnRlbnREZWNscywgPDxFTkQpOwotICAgIFJlZlB0cjxFdmVudExpc3RlbmVy PiBsaXN0ZW5lciA9IFY4RXZlbnRMaXN0ZW5lckxpc3Q6OmdldEV2ZW50TGlzdGVuZXIoYXJnc1sx XSwgZmFsc2UsIExpc3RlbmVyRmluZCR7bG9va3VwVHlwZX0pOwotICAgIGlmIChsaXN0ZW5lcikg ewotICAgICAgICBWOFRSWUNBVENIX0ZPUl9WOFNUUklOR1JFU09VUkNFKFY4U3RyaW5nUmVzb3Vy Y2U8V2l0aE51bGxDaGVjaz4sIHN0cmluZ1Jlc291cmNlLCBhcmdzWzBdKTsKLSAgICAgICAgVjgk e2ludGVyZmFjZU5hbWV9Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKS0+JHtuYW1lfShzdHJpbmdS ZXNvdXJjZSwgbGlzdGVuZXIke3Bhc3NSZWZQdHJIYW5kbGluZ30sIGFyZ3NbMl0tPkJvb2xlYW5W YWx1ZSgpKTsKLUVORAotICAgIGlmICgkcmVxdWlyZXNIaWRkZW5EZXBlbmRlbmN5KSB7Ci0gICAg ICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsIDw8RU5EKTsKLSAgICAgICAgJHtoaWRkZW5EZXBl bmRlbmN5QWN0aW9ufUhpZGRlbkRlcGVuZGVuY3koYXJncy5Ib2xkZXIoKSwgYXJnc1sxXSwgVjgk e2ludGVyZmFjZU5hbWV9OjpldmVudExpc3RlbmVyQ2FjaGVJbmRleCwgYXJncy5HZXRJc29sYXRl KCkpOwotRU5ECi0gICAgfQotICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsIDw8RU5EKTsKLSAg ICB9Ci0gICAgcmV0dXJuIHY4VW5kZWZpbmVkKCk7Ci19Ci0KLUVORAotfQotCiBzdWIgR2VuZXJh dGVQYXJhbWV0ZXJzQ2hlY2tFeHByZXNzaW9uCiB7CiAgICAgbXkgJG51bVBhcmFtZXRlcnMgPSBz aGlmdDsKQEAgLTE1MzYsMTcgKzE0OTMsNiBAQCBzdWIgR2VuZXJhdGVGdW5jdGlvbkNhbGxiYWNr CiAgICAgICAgICRuYW1lID0gJG5hbWUgLiAkZnVuY3Rpb24tPntvdmVybG9hZEluZGV4fTsKICAg ICB9CiAKLSAgICAjIEFkZGluZyBhbmQgcmVtb3ZpbmcgZXZlbnQgbGlzdGVuZXJzIGFyZSBub3Qg c3RhbmRhcmQgY2FsbGJhY2sgYmVoYXZpb3IsCi0gICAgIyBidXQgdGhleSBhcmUgZXh0cmVtZWx5 IGNvbnNpc3RlbnQgYWNyb3NzIHRoZSB2YXJpb3VzIGludGVyZmFjZXMgdGhhdCB0YWtlIGV2ZW50 IGxpc3RlbmVycywKLSAgICAjIHNvIHdlIGNhbiBnZW5lcmF0ZSB0aGVtIGFzIGEgInNwZWNpYWwg Y2FzZSIuCi0gICAgaWYgKCRuYW1lIGVxICJhZGRFdmVudExpc3RlbmVyIikgewotICAgICAgICBH ZW5lcmF0ZUV2ZW50TGlzdGVuZXJDYWxsYmFjaygkaW50ZXJmYWNlTmFtZSwgISRjb2RlR2VuZXJh dG9yLT5Jbmhlcml0c0ludGVyZmFjZSgkaW50ZXJmYWNlLCAiTm9kZSIpLCAkZnVuY3Rpb24pOwot ICAgICAgICByZXR1cm47Ci0gICAgfSBlbHNpZiAoJG5hbWUgZXEgInJlbW92ZUV2ZW50TGlzdGVu ZXIiKSB7Ci0gICAgICAgIEdlbmVyYXRlRXZlbnRMaXN0ZW5lckNhbGxiYWNrKCRpbnRlcmZhY2VO YW1lLCAhJGNvZGVHZW5lcmF0b3ItPkluaGVyaXRzSW50ZXJmYWNlKCRpbnRlcmZhY2UsICJOb2Rl IiksICRmdW5jdGlvbik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBteSAkY29uZGl0 aW9uYWxTdHJpbmcgPSAkY29kZUdlbmVyYXRvci0+R2VuZXJhdGVDb25kaXRpb25hbFN0cmluZygk ZnVuY3Rpb24tPnNpZ25hdHVyZSk7CiAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiNpZiAk e2NvbmRpdGlvbmFsU3RyaW5nfVxuXG4iKSBpZiAkY29uZGl0aW9uYWxTdHJpbmc7CiAgICAgcHVz aChAaW1wbENvbnRlbnREZWNscywgPDxFTkQpOwpAQCAtMTU2Niw2ICsxNTEyLDMzIEBAIEVORAog ICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgaWYgKCRuYW1lIGVxICJhZGRFdmVudExpc3Rl bmVyIiB8fCAkbmFtZSBlcSAicmVtb3ZlRXZlbnRMaXN0ZW5lciIpIHsKKyAgICAgICAgbXkgJGxv b2t1cFR5cGUgPSAoJG5hbWUgZXEgImFkZEV2ZW50TGlzdGVuZXIiKSA/ICJPckNyZWF0ZSIgOiAi T25seSI7CisgICAgICAgIG15ICRwYXNzUmVmUHRySGFuZGxpbmcgPSAoJG5hbWUgZXEgImFkZEV2 ZW50TGlzdGVuZXIiKSA/ICIiIDogIi5nZXQoKSI7CisgICAgICAgIG15ICRoaWRkZW5EZXBlbmRl bmN5QWN0aW9uID0gKCRuYW1lIGVxICJhZGRFdmVudExpc3RlbmVyIikgPyAiY3JlYXRlIiA6ICJy ZW1vdmUiOworCisgICAgICAgIEFkZFRvSW1wbEluY2x1ZGVzKCJWOEV2ZW50TGlzdGVuZXJMaXN0 LmgiKTsKKyAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgPDxFTkQpOworICAgIFJlZlB0 cjxFdmVudExpc3RlbmVyPiBsaXN0ZW5lciA9IFY4RXZlbnRMaXN0ZW5lckxpc3Q6OmdldEV2ZW50 TGlzdGVuZXIoYXJnc1sxXSwgZmFsc2UsIExpc3RlbmVyRmluZCR7bG9va3VwVHlwZX0pOworICAg IGlmIChsaXN0ZW5lcikgeworICAgICAgICBWOFRSWUNBVENIX0ZPUl9WOFNUUklOR1JFU09VUkNF KFY4U3RyaW5nUmVzb3VyY2U8V2l0aE51bGxDaGVjaz4sIHN0cmluZ1Jlc291cmNlLCBhcmdzWzBd KTsKKyAgICAgICAgVjgke2ludGVyZmFjZU5hbWV9Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKS0+ JHtuYW1lfShzdHJpbmdSZXNvdXJjZSwgbGlzdGVuZXIke3Bhc3NSZWZQdHJIYW5kbGluZ30sIGFy Z3NbMl0tPkJvb2xlYW5WYWx1ZSgpKTsKK0VORAorICAgICAgICBpZiAoISRjb2RlR2VuZXJhdG9y LT5Jbmhlcml0c0ludGVyZmFjZSgkaW50ZXJmYWNlLCAiTm9kZSIpKSB7CisgICAgICAgICAgICBw dXNoKEBpbXBsQ29udGVudERlY2xzLCA8PEVORCk7CisgICAgICAgICR7aGlkZGVuRGVwZW5kZW5j eUFjdGlvbn1IaWRkZW5EZXBlbmRlbmN5KGFyZ3MuSG9sZGVyKCksIGFyZ3NbMV0sIFY4JHtpbnRl cmZhY2VOYW1lfTo6ZXZlbnRMaXN0ZW5lckNhY2hlSW5kZXgsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsK K0VORAorICAgICAgICB9CisgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsIDw8RU5EKTsK KyAgICB9CisgICAgcmV0dXJuIHY4VW5kZWZpbmVkKCk7Cit9CisKK0VORAorICAgICAgICBwdXNo KEBpbXBsQ29udGVudERlY2xzLCAiI2VuZGlmIC8vICR7Y29uZGl0aW9uYWxTdHJpbmd9XG5cbiIp IGlmICRjb25kaXRpb25hbFN0cmluZzsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIHB1 c2goQGltcGxDb250ZW50RGVjbHMsIEdlbmVyYXRlQXJndW1lbnRzQ291bnRDaGVjaygkZnVuY3Rp b24sICRpbnRlcmZhY2UpKTsKIAogICAgIGlmICgkbmFtZSBlcSAic2V0IiBhbmQgJGludGVyZmFj ZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IlR5cGVkQXJyYXkifSkgewo=