64231 2011-07-09 10:45:48 -0700 Generate conditional include statements in CodeGeneratorJS 2011-07-22 12:32:45 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 64960 64961 65040 1 paroga paroga oldest_to_newest 434500 0 paroga 2011-07-09 10:45:48 -0700 Generate conditional include statements in CodeGeneratorJS 434501 1 100210 paroga 2011-07-09 11:04:30 -0700 Created attachment 100210 Patch 434640 2 100210 bfulgham 2011-07-10 18:57:31 -0700 Comment on attachment 100210 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100210&action=review Great idea! I have a question (inline), but otherwise looks good. > Source/WebCore/bindings/scripts/CodeGeneratorJS.pm:2948 > + foreach my $include (sort keys %implIncludes) { We didn't sort these keys previously. Is the sorting just for legibility in the output? Or is it necessary to get proper function in generating the conditionalized output? 434669 3 100210 paroga 2011-07-10 22:08:33 -0700 Comment on attachment 100210 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100210&action=review >> Source/WebCore/bindings/scripts/CodeGeneratorJS.pm:2948 >> + foreach my $include (sort keys %implIncludes) { > > We didn't sort these keys previously. Is the sorting just for legibility in the output? Or is it necessary to get proper function in generating the conditionalized output? Uhh, it's a relict of a temporary change. I'll remove it. 434671 4 paroga 2011-07-10 22:20:17 -0700 Committed r90717: <http://trac.webkit.org/changeset/90717> 100210 2011-07-09 11:04:30 -0700 2011-07-10 22:19:02 -0700 Patch bug-64231-20110709200428.patch text/plain 4870 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogOTA2ODEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1N2M1MWFhODRmZGEwODhl MDFhNDIzZjE4MDk0ZGRjMDFhNmY0MWQ1Li5kMTJhNjhjODE5NGVkNTA2ZmFlNTc3MDE0NjM3ZWU0 MmUzMDNiN2U1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMDkgIFBhdHJp Y2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgR2VuZXJhdGUgY29u ZGl0aW9uYWwgaW5jbHVkZSBzdGF0ZW1lbnRzIGluIENvZGVHZW5lcmF0b3JKUworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQyMzEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdXJvdW5kIGhlYWRlcnMgd2l0 aCBhIGNvcnJlc3BvbmRpZyAjaWYgRU5BQkxFKCkgbGluZS4KKyAgICAgICAgVGhpcyBhbGxvd3Mg dXMgdG8gZ2VuZXJhdGUgYmluZGluZ3Mgb25seSBvZiByZXF1aXJlZCBJREwgZmlsZXMuCisKKyAg ICAgICAgQ2hhbmdpbmcgdGhlIGN1cnJlbnQgcHJlcHJvY2Vzc29yIHN0YXRlbWVudHMgdG8gdGhl IENvbmRpdGlvbmFsIGF0dHJpYnV0ZQorICAgICAgICBpbiBhIG5leHQgc3RlcCBoZWxwcyBpbiBn ZXR0aW5nIHJpZCBvZiBjYWxscyB0byB0aGUgcHJlcHJvY2Vzc29yLAorICAgICAgICB3aGljaCBj YXVzZXMgc28gbXVjaCBwYWluIG9uIGEgbmF0dmllIFdpbmRvd3MgZW52aXJvbm1lbnQuIAorCisg ICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG06CisgICAgICAgIChH ZW5lcmF0ZUltcGxlbWVudGF0aW9uKToKKyAgICAgICAgKFdyaXRlRGF0YSk6CisKIDIwMTEtMDct MDkgIE5pa29sYXMgWmltbWVybWFubiAgPG56aW1tZXJtYW5uQHJpbS5jb20+CiAKICAgICAgICAg QWRkIGEgcG9zc2liaWxpdHkgdG8gcmV0cmlldmUgdGhlIGFzc29jaWF0ZWQgU1ZHQW5pbWF0ZWRQ cm9wZXJ0eSBvYmplY3QgZm9yIGEgY2VydGFpbiBYTUwgYXR0cmlidXRlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbSBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCmluZGV4IGNmYzFm OTMzZjNjYTQ2ZjEzMGZhMWU2NGIwN2M3NDRhYzlhMGY3ZGQuLmQzNDExMzEwYjgwMjQ0NjRjMjM0 MWYxNTc4YjI1Yjc1NjNmMGMxODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCkBAIC03LDYgKzcsNyBAQAogIyBDb3B5cmlnaHQg KEMpIDIwMDkgQ2FtZXJvbiBNY0Nvcm1hY2sgPGNhbUBtY2MuaWQuYXU+CiAjIENvcHlyaWdodCAo QykgUmVzZWFyY2ggSW4gTW90aW9uIExpbWl0ZWQgMjAxMC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICMgQ29weXJpZ2h0IChDKSAyMDEwIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lk aWFyeSgtaWVzKQorIyBDb3B5cmlnaHQgKEMpIDIwMTEgUGF0cmljayBHYW5zdGVyZXIgPHBhcm9n YUB3ZWJraXQub3JnPgogIwogIyBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNh biByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAjIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2Yg dGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCkBAIC0xNzUxLDcgKzE3NTIsMjMgQEAgc3Vi IEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICAgICAgICAgICAgICAgICAgICBteSAk Y29uc3RydWN0b3JUeXBlID0gJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT50eXBlOwogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICRjb25zdHJ1Y3RvclR5cGUgPX4gcy9Db25zdHJ1Y3RvciQvLzsK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoJGNvbnN0cnVjdG9yVHlwZSBuZSAiRE9N T2JqZWN0IikgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAkaW1wbEluY2x1ZGVz eyJKUyIgLiAkY29uc3RydWN0b3JUeXBlIC4gIi5oIn0gPSAxOworICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBteSAkaGVhZGVyID0gIkpTIiAuICRjb25zdHJ1Y3RvclR5cGUgLiAiLmgi OworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBteSAkY29uZGl0aW9uYWwgPSAkYXR0 cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDb25kaXRpb25hbCJ9Owor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAobm90ICRjb25kaXRpb25hbCkgewor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJGltcGxJbmNsdWRlc3skaGVhZGVy fSA9IDE7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzaWYgKG5vdCBleGlz dHMoJGltcGxJbmNsdWRlc3skaGVhZGVyfSkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICRpbXBsSW5jbHVkZXN7JGhlYWRlcn0gPSAkY29uZGl0aW9uYWw7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBteSAkb2xkVmFsdWUgPSAkaW1wbEluY2x1ZGVzeyRoZWFkZXJ9OworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCRvbGRWYWx1ZSBuZSAxKSB7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbXkgJW5ld1ZhbHVlID0gKCk7 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJG5ld1ZhbHVleyRjb25k aXRpb25hbH0gPSAxOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZv cmVhY2ggbXkgJGNvbmRpdGlvbiAoc3BsaXQoL1x8LywgJG9sZFZhbHVlKSkgeworICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAkbmV3VmFsdWV7JGNvbmRpdGlvbn0g PSAxOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAkaW1wbEluY2x1ZGVzeyRoZWFkZXJ9ID0g am9pbigifCIsIHNvcnQga2V5cyAlbmV3VmFsdWUpOworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2go QGltcGxDb250ZW50LCAiICAgIC8vIFNoYWRvd2luZyBhIGJ1aWx0LWluIGNvbnN0cnVjdG9yXG4i KTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoJGludGVyZmFjZU5hbWUgZXEgIkRP TVdpbmRvdyIgJiYgJGNsYXNzTmFtZSBlcSAiSlNibGFoIikgewpAQCAtMjkyNywxNyArMjk0NCwz MSBAQCBzdWIgV3JpdGVEYXRhCiAgICAgICAgIHByaW50ICRJTVBMIEBpbXBsQ29udGVudEhlYWRl cjsKIAogICAgICAgICBteSBAaW5jbHVkZXMgPSAoKTsKLSAgICAgICAgZm9yZWFjaCBteSAkaW5j bHVkZSAoa2V5cyAlaW1wbEluY2x1ZGVzKSB7CisgICAgICAgIG15ICVpbXBsSW5jbHVkZUNvbmRp dGlvbnMgPSAoKTsKKyAgICAgICAgZm9yZWFjaCBteSAkaW5jbHVkZSAoc29ydCBrZXlzICVpbXBs SW5jbHVkZXMpIHsKKyAgICAgICAgICAgIG15ICRjb25kaXRpb24gPSAkaW1wbEluY2x1ZGVzeyRp bmNsdWRlfTsKICAgICAgICAgICAgIG15ICRjaGVja1R5cGUgPSAkaW5jbHVkZTsKICAgICAgICAg ICAgICRjaGVja1R5cGUgPX4gcy9cLmgvLzsKICAgICAgICAgICAgIG5leHQgaWYgJGNvZGVHZW5l cmF0b3ItPklzU1ZHQW5pbWF0ZWRUeXBlKCRjaGVja1R5cGUpOwogCiAgICAgICAgICAgICAkaW5j bHVkZSA9ICJcIiRpbmNsdWRlXCIiIHVubGVzcyAkaW5jbHVkZSA9fiAvXlsiPF0vOyAjICIKLSAg ICAgICAgICAgIHB1c2ggQGluY2x1ZGVzLCAkaW5jbHVkZTsKKworICAgICAgICAgICAgaWYgKCRj b25kaXRpb24gZXEgMSkgeworICAgICAgICAgICAgICAgIHB1c2ggQGluY2x1ZGVzLCAkaW5jbHVk ZTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgcHVzaCBAeyRpbXBsSW5j bHVkZUNvbmRpdGlvbnN7JGNvbmRpdGlvbn19LCAkaW5jbHVkZTsKKyAgICAgICAgICAgIH0KICAg ICAgICAgfQogICAgICAgICBmb3JlYWNoIG15ICRpbmNsdWRlIChzb3J0IEBpbmNsdWRlcykgewog ICAgICAgICAgICAgcHJpbnQgJElNUEwgIiNpbmNsdWRlICRpbmNsdWRlXG4iOwogICAgICAgICB9 CisgICAgICAgIGZvcmVhY2ggbXkgJGNvbmRpdGlvbiAoc29ydCBrZXlzICVpbXBsSW5jbHVkZUNv bmRpdGlvbnMpIHsKKyAgICAgICAgICAgIHByaW50ICRJTVBMICJcbiNpZiAiIC4gR2VuZXJhdGVD b25kaXRpb25hbFN0cmluZ0Zyb21BdHRyaWJ1dGVWYWx1ZSgkY29uZGl0aW9uKSAuICJcbiI7Cisg ICAgICAgICAgICBmb3JlYWNoIG15ICRpbmNsdWRlIChzb3J0IEB7JGltcGxJbmNsdWRlQ29uZGl0 aW9uc3skY29uZGl0aW9ufX0pIHsKKyAgICAgICAgICAgICAgICBwcmludCAkSU1QTCAiI2luY2x1 ZGUgJGluY2x1ZGVcbiI7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBwcmludCAkSU1QTCAi I2VuZGlmXG4iOworICAgICAgICB9CiAKICAgICAgICAgcHJpbnQgJElNUEwgQGltcGxDb250ZW50 OwogICAgICAgICBjbG9zZSgkSU1QTCk7Cg==