18916 2008-05-06 16:42:14 -0700 make_names.pl --factory needs to support custom c++ guard 2008-05-08 17:07:45 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jchaffraix jchaffraix oldest_to_newest 79775 0 jchaffraix 2008-05-06 16:42:14 -0700 Currently factories generated by make_names are protected by "ENABLE(SVG)" which should not be hardcoded but left as a command line option. 79776 1 20990 jchaffraix 2008-05-06 16:46:01 -0700 Created attachment 20990 First try 79784 2 20990 eric 2008-05-06 19:05:21 -0700 Comment on attachment 20990 First try Looks good to me. You can avoid checking guardFactory against "" everywhere by just inverting the if. I think that "" is false in perl. If its not, then you can do the "" check at the top, and assign guardFactory to some value which is false, like null. it's OK as is, or with the further "" check cleanup. I don't need to see the patch again before you land. r=me. 79942 3 jchaffraix 2008-05-08 17:07:45 -0700 > You can avoid checking guardFactory against "" everywhere by just inverting the > if. I think that "" is false in perl. If its not, then you can do the "" > check at the top, and assign guardFactory to some value which is false, like > null. > I got confused by using 'unless' which is why I needed to check against the empty string. I switched to 'if' and cleaned up the patch as Eric suggested. Committed in r32989. 20990 2008-05-06 16:46:01 -0700 2008-05-06 19:05:21 -0700 First try bug18916.patch text/plain 6960 jchaffraix ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODQ5YmIwYy4uODZjODJlNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAwOC0wNS0wNiAgSnVsaWVuIENoYWZm cmFpeCAgPGpjaGFmZnJhaXhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBCdWcgMTg5MTY6IG1ha2VfbmFtZXMucGwgLS1mYWN0b3J5 IG5lZWRzIHRvIHN1cHBvcnQgY3VzdG9tIGMrKyBndWFyZAorCisgICAgICAgIEFkZCAtLWd1YXJk RmFjdG9yeVdpdGggdG8gaGFuZGxlIHRoZSBjcHAgZ3VhcmQgYXJvdW5kIGdlbmVyYXRlZCBmYWN0 b3JpZXMuCisKKyAgICAgICAgKiBEZXJpdmVkU291cmNlcy5tYWtlOiBTZXQgdGhlIGd1YXJkRmFj dG9yeVdpdGggdmFyaWFibGUgZm9yIFNWRyBmYWN0b3J5LgorICAgICAgICAqIEdOVW1ha2VmaWxl LmFtOiBEaXR0by4KKyAgICAgICAgKiBXZWJDb3JlLnBybzogRGl0dG8uCisgICAgICAgICogZG9t L21ha2VfbmFtZXMucGw6IEFkZCBndWFyZEZhY3RvcnlXaXRoIG9wdGlvbi4KKwogMjAwOC0wNS0w NiAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEJldGggRGFraW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLm1h a2UgYi9XZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLm1ha2UKaW5kZXggYzk2YzdmMi4uNDI1ZGI4NyAx MDA2NDQKLS0tIGEvV2ViQ29yZS9EZXJpdmVkU291cmNlcy5tYWtlCisrKyBiL1dlYkNvcmUvRGVy aXZlZFNvdXJjZXMubWFrZQpAQCAtNTQ2LDEyICs1NDYsMTIgQEAgaWZkZWYgU1ZHX0ZMQUdTCiAK IFNWR0VsZW1lbnRGYWN0b3J5LmNwcCBTVkdOYW1lcy5jcHAgOiBkb20vbWFrZV9uYW1lcy5wbCBz dmcvc3ZndGFncy5pbiBzdmcvc3ZnYXR0cnMuaW4KIAlwZXJsICQ8IC0tdGFncyAkKFdlYkNvcmUp L3N2Zy9zdmd0YWdzLmluIC0tYXR0cnMgJChXZWJDb3JlKS9zdmcvc3ZnYXR0cnMuaW4gLS1leHRy YURlZmluZXMgIiQoU1ZHX0ZMQUdTKSIgXAotICAgICAgICAgICAgLS1uYW1lc3BhY2UgU1ZHIC0t Y3BwTmFtZXNwYWNlIFdlYkNvcmUgLS1uYW1lc3BhY2VVUkkgImh0dHA6Ly93d3cudzMub3JnLzIw MDAvc3ZnIiAtLWZhY3RvcnkgLS1hdHRyc051bGxOYW1lc3BhY2UgLS1vdXRwdXQgLgorICAgICAg ICAgICAgLS1uYW1lc3BhY2UgU1ZHIC0tZ3VhcmRGYWN0b3J5V2l0aCBcIkVOQUJMRShTVkcpXCIg LS1jcHBOYW1lc3BhY2UgV2ViQ29yZSAtLW5hbWVzcGFjZVVSSSAiaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIC0tZmFjdG9yeSAtLWF0dHJzTnVsbE5hbWVzcGFjZSAtLW91dHB1dCAuCiBlbHNl CiAKIFNWR0VsZW1lbnRGYWN0b3J5LmNwcCBTVkdOYW1lcy5jcHAgOiBkb20vbWFrZV9uYW1lcy5w bCBzdmcvc3ZndGFncy5pbiBzdmcvc3ZnYXR0cnMuaW4KIAlwZXJsICQ8IC0tdGFncyAkKFdlYkNv cmUpL3N2Zy9zdmd0YWdzLmluIC0tYXR0cnMgJChXZWJDb3JlKS9zdmcvc3ZnYXR0cnMuaW4gXAot ICAgICAgICAgICAgLS1uYW1lc3BhY2UgU1ZHIC0tY3BwTmFtZXNwYWNlIFdlYkNvcmUgLS1uYW1l c3BhY2VVUkkgImh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiAtLWZhY3RvcnkgLS1hdHRyc051 bGxOYW1lc3BhY2UgLS1vdXRwdXQgLgorICAgICAgICAgICAgLS1uYW1lc3BhY2UgU1ZHIC0tZ3Vh cmRGYWN0b3J5V2l0aCBcIkVOQUJMRShTVkcpXCIgLS1jcHBOYW1lc3BhY2UgV2ViQ29yZSAtLW5h bWVzcGFjZVVSSSAiaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIC0tZmFjdG9yeSAtLWF0dHJz TnVsbE5hbWVzcGFjZSAtLW91dHB1dCAuCiAKIGVuZGlmCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUv R05VbWFrZWZpbGUuYW0gYi9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtCmluZGV4IGYxOGE0N2IuLjMz ZWVjZDAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0KKysrIGIvV2ViQ29yZS9H TlVtYWtlZmlsZS5hbQpAQCAtMjEwMiwxMCArMjEwMiwxMCBAQCBEZXJpdmVkU291cmNlcy9TVkdO YW1lcy5jcHA6IERlcml2ZWRTb3VyY2VzL1NWR0VsZW1lbnRGYWN0b3J5LmNwcDsKIGlmIFNWR19G TEFHUwogRGVyaXZlZFNvdXJjZXMvU1ZHRWxlbWVudEZhY3RvcnkuY3BwOiAkKFdlYkNvcmUpL2Rv bS9tYWtlX25hbWVzLnBsICQoV2ViQ29yZSkvc3ZnL3N2Z3RhZ3MuaW4gJChXZWJDb3JlKS9zdmcv c3ZnYXR0cnMuaW4KIAkkKFBFUkwpICQ8IC0tdGFncyAkKFdlYkNvcmUpL3N2Zy9zdmd0YWdzLmlu IC0tYXR0cnMgJChXZWJDb3JlKS9zdmcvc3ZnYXR0cnMuaW4gLS1leHRyYURlZmluZXMgIiQoU1ZH X0ZFQVRVUkVTKSIgXAotCS0tbmFtZXNwYWNlIFNWRyAtLWNwcE5hbWVzcGFjZSBXZWJDb3JlIC0t bmFtZXNwYWNlVVJJICJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgLS1mYWN0b3J5IC0tYXR0 cnNOdWxsTmFtZXNwYWNlIC0tb3V0cHV0ICQoR0VOU09VUkNFUykKKwktLW5hbWVzcGFjZSBTVkcg LS1ndWFyZEZhY3RvcnlXaXRoPSJFTkFCTEUoU1ZHKSIgLS1jcHBOYW1lc3BhY2UgV2ViQ29yZSAt LW5hbWVzcGFjZVVSSSAiaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIC0tZmFjdG9yeSAtLWF0 dHJzTnVsbE5hbWVzcGFjZSAtLW91dHB1dCAkKEdFTlNPVVJDRVMpCiBlbHNlCiBEZXJpdmVkU291 cmNlcy9TVkdFbGVtZW50RmFjdG9yeS5jcHA6ICQoV2ViQ29yZSkvZG9tL21ha2VfbmFtZXMucGwg JChXZWJDb3JlKS9zdmcvc3ZndGFncy5pbiAkKFdlYkNvcmUpL3N2Zy9zdmdhdHRycy5pbgotCSQo UEVSTCkgJDwgLS10YWdzICQoV2ViQ29yZSkvc3ZnL3N2Z3RhZ3MuaW4gLS1hdHRycyAkKFdlYkNv cmUpL3N2Zy9zdmdhdHRycy5pbiAtLW5hbWVzcGFjZSBTVkcgLS1jcHBOYW1lc3BhY2UgV2ViQ29y ZSAtLW5hbWVzcGFjZVVSSSAiaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIC0tZmFjdG9yeSAt LWF0dHJzTnVsbE5hbWVzcGFjZSAtLW91dHB1dCAkKEdFTlNPVVJDRVMpCisJJChQRVJMKSAkPCAt LXRhZ3MgJChXZWJDb3JlKS9zdmcvc3ZndGFncy5pbiAtLWF0dHJzICQoV2ViQ29yZSkvc3ZnL3N2 Z2F0dHJzLmluIC0tbmFtZXNwYWNlIFNWRyAtLWd1YXJkRmFjdG9yeVdpdGg9IkVOQUJMRShTVkcp IiAtLWNwcE5hbWVzcGFjZSBXZWJDb3JlIC0tbmFtZXNwYWNlVVJJICJodHRwOi8vd3d3LnczLm9y Zy8yMDAwL3N2ZyIgLS1mYWN0b3J5IC0tYXR0cnNOdWxsTmFtZXNwYWNlIC0tb3V0cHV0ICQoR0VO U09VUkNFUykKIAogZW5kaWYgIyBTVkdfRkxBR1MKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJD b3JlLnBybyBiL1dlYkNvcmUvV2ViQ29yZS5wcm8KaW5kZXggM2I1YjI0Ni4uYWMzMmI1MyAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLnBybworKysgYi9XZWJDb3JlL1dlYkNvcmUucHJvCkBA IC0xNzQ2LDcgKzE3NDYsNyBAQCBndGstcG9ydDpTT1VSQ0VTICs9IFwKIAogICAgICAgICAjIEdF TkVSQVRPUiA1LUM6CiAgICAgICAgIHN2Z25hbWVzX2Eub3V0cHV0ID0gJCRHRU5FUkFURURfU09V UkNFU19ESVIvU1ZHTmFtZXMuY3BwCi0gICAgICAgIHN2Z25hbWVzX2EuY29tbWFuZHMgPSBwZXJs ICQkUFdEL2RvbS9tYWtlX25hbWVzLnBsIC0tdGFncyAkJFBXRC9zdmcvc3ZndGFncy5pbiAtLWF0 dHJzICQkUFdEL3N2Zy9zdmdhdHRycy5pbiAtLW5hbWVzcGFjZSBTVkcgLS1ndWFyZENwcFdpdGgg XCJFTkFCTEUoU1ZHKVwiIC0tY3BwTmFtZXNwYWNlIFdlYkNvcmUgLS1uYW1lc3BhY2VVUkkgJ2h0 dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyAtLWZhY3RvcnkgLS1hdHRyc051bGxOYW1lc3BhY2Ug LS1wcmVwcm9jZXNzb3IgXCIkJHtRTUFLRV9NT0N9IC1FXCIgLS1vdXRwdXQgJCRHRU5FUkFURURf U09VUkNFU19ESVIKKyAgICAgICAgc3ZnbmFtZXNfYS5jb21tYW5kcyA9IHBlcmwgJCRQV0QvZG9t L21ha2VfbmFtZXMucGwgLS10YWdzICQkUFdEL3N2Zy9zdmd0YWdzLmluIC0tYXR0cnMgJCRQV0Qv c3ZnL3N2Z2F0dHJzLmluIC0tbmFtZXNwYWNlIFNWRyAtLWd1YXJkRmFjdG9yeVdpdGggXCJFTkFC TEUoU1ZHKVwiIC0tY3BwTmFtZXNwYWNlIFdlYkNvcmUgLS1uYW1lc3BhY2VVUkkgJ2h0dHA6Ly93 d3cudzMub3JnLzIwMDAvc3ZnJyAtLWZhY3RvcnkgLS1hdHRyc051bGxOYW1lc3BhY2UgLS1wcmVw cm9jZXNzb3IgXCIkJHtRTUFLRV9NT0N9IC1FXCIgLS1vdXRwdXQgJCRHRU5FUkFURURfU09VUkNF U19ESVIKICAgICAgICAgc3ZnbmFtZXNfYS5pbnB1dCA9IFNWR19OQU1FUwogICAgICAgICBzdmdu YW1lc19hLmRlcGVuZGVuY3lfdHlwZSA9IFRZUEVfQwogICAgICAgICBzdmduYW1lc19hLkNPTkZJ RyA9IHRhcmdldF9wcmVkZXBzCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9tYWtlX25hbWVzLnBs IGIvV2ViQ29yZS9kb20vbWFrZV9uYW1lcy5wbAppbmRleCBiODk1NzliLi5jNThiY2QzIDEwMDc1 NQotLS0gYS9XZWJDb3JlL2RvbS9tYWtlX25hbWVzLnBsCisrKyBiL1dlYkNvcmUvZG9tL21ha2Vf bmFtZXMucGwKQEAgLTQ1LDYgKzQ1LDcgQEAgbXkgJHRhZ3NOdWxsTmFtZXNwYWNlID0gMDsKIG15 ICRhdHRyc051bGxOYW1lc3BhY2UgPSAwOwogbXkgJGV4dHJhRGVmaW5lcyA9IDA7CiBteSAkcHJl cHJvY2Vzc29yID0gIi91c3IvYmluL2djYyAtRSAtUCAteCBjKysiOworbXkgJGd1YXJkRmFjdG9y eVdpdGggPSAiIjsKIAogR2V0T3B0aW9ucygndGFncz1zJyA9PiBcJHRhZ3NGaWxlLCAKICAgICAn YXR0cnM9cycgPT4gXCRhdHRyc0ZpbGUsCkBAIC01Nyw3ICs1OCw4IEBAIEdldE9wdGlvbnMoJ3Rh Z3M9cycgPT4gXCR0YWdzRmlsZSwKICAgICAndGFnc051bGxOYW1lc3BhY2UnID0+IFwkdGFnc051 bGxOYW1lc3BhY2UsCiAgICAgJ2F0dHJzTnVsbE5hbWVzcGFjZScgPT4gXCRhdHRyc051bGxOYW1l c3BhY2UsCiAgICAgJ2V4dHJhRGVmaW5lcz1zJyA9PiBcJGV4dHJhRGVmaW5lcywKLSAgICAncHJl cHJvY2Vzc29yPXMnID0+IFwkcHJlcHJvY2Vzc29yKTsKKyAgICAncHJlcHJvY2Vzc29yPXMnID0+ IFwkcHJlcHJvY2Vzc29yLAorICAgICdndWFyZEZhY3RvcnlXaXRoPXMnID0+IFwkZ3VhcmRGYWN0 b3J5V2l0aCk7CiAKIGRpZSAiWW91IG11c3Qgc3BlY2lmeSBhIG5hbWVzcGFjZSAoZS5nLiBTVkcp IGZvciA8bmFtZXNwYWNlPk5hbWVzLmgiIHVubGVzcyAkbmFtZXNwYWNlOwogZGllICJZb3UgbXVz dCBzcGVjaWZ5IGEgbmFtZXNwYWNlVVJJIChlLmcuIGh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3Zn KSIgdW5sZXNzICRuYW1lc3BhY2VVUkk7CkBAIC0xMTksNyArMTIxLDcgQEAgc3ViIHByaW50TWFj cm9zCiBzdWIgcHJpbnRDb25zdHJ1Y3RvcnMKIHsKICAgICBteSAoJEYsIEBuYW1lcykgPSBAXzsK LSAgICBwcmludCBGICIjaWYgRU5BQkxFKFNWRylcbiI7CisgICAgcHJpbnQgRiAiI2lmICRndWFy ZEZhY3RvcnlXaXRoXG4iIHVubGVzcyAkZ3VhcmRGYWN0b3J5V2l0aCBlcSAiIjsKICAgICBmb3Ig bXkgJG5hbWUgKEBuYW1lcykgewogICAgICAgICBteSAkdXBwZXJDYXNlID0gdXBwZXJDYXNlTmFt ZSgkbmFtZSk7CiAgICAgCkBAIC0xMjgsNyArMTMwLDcgQEAgc3ViIHByaW50Q29uc3RydWN0b3Jz CiAgICAgICAgIHByaW50IEYgIiAgICByZXR1cm4gbmV3ICR7bmFtZXNwYWNlfSR7dXBwZXJDYXNl fUVsZW1lbnQoJHtuYW1lfVRhZywgZG9jKTtcbiI7CiAgICAgICAgIHByaW50IEYgIn1cblxuIjsK ICAgICB9Ci0gICAgcHJpbnQgRiAiI2VuZGlmXG4iOworICAgIHByaW50IEYgIiNlbmRpZlxuIiB1 bmxlc3MgJGd1YXJkRmFjdG9yeVdpdGggZXEgIiI7CiB9CiAKIHN1YiBwcmludEZ1bmN0aW9uSW5p dHMKQEAgLTQwNyw4ICs0MDksOSBAQCBFTkQKIAogcHJpbnRDb25zdHJ1Y3RvcnMoJEYsIEB0YWdz KTsKIAorcHJpbnQgRiAiI2lmICRndWFyZEZhY3RvcnlXaXRoXG4iIHVubGVzcyAkZ3VhcmRGYWN0 b3J5V2l0aCBlcSAiIjsKKwogcHJpbnQgRiA8PEVORAotI2lmIEVOQUJMRShTVkcpCiBzdGF0aWMg aW5saW5lIHZvaWQgY3JlYXRlRnVuY3Rpb25NYXBJZk5lY2Vzc2FyeSgpCiB7CiAgICAgaWYgKGdG dW5jdGlvbk1hcCkKQEAgLTQyMiwxMyArNDI1LDE4IEBAIEVORAogCiBwcmludEZ1bmN0aW9uSW5p dHMoJEYsIEB0YWdzKTsKIAotcHJpbnQgRiA8PEVORAotfQotI2VuZGlmCitwcmludCBGICJ9XG4i OworcHJpbnQgRiAiI2VuZGlmXG5cbiIgdW5sZXNzICRndWFyZEZhY3RvcnlXaXRoIGVxICIiOwog CitwcmludCBGIDw8RU5ECiAke25hbWVzcGFjZX1FbGVtZW50ICoke25hbWVzcGFjZX1FbGVtZW50 RmFjdG9yeTo6Y3JlYXRlJHtuYW1lc3BhY2V9RWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiBx TmFtZSwgRG9jdW1lbnQqIGRvYywgYm9vbCBjcmVhdGVkQnlQYXJzZXIpCiB7Ci0jaWYgRU5BQkxF KFNWRykKK0VORAorOworCitwcmludCBGICIjaWYgJGd1YXJkRmFjdG9yeVdpdGhcbiIgdW5sZXNz ICRndWFyZEZhY3RvcnlXaXRoIGVxICIiOworCitwcmludCBGIDw8RU5ECiAgICAgLy8gRG9uJ3Qg bWFrZSBlbGVtZW50cyB3aXRob3V0IGEgZG9jdW1lbnQKICAgICBpZiAoIWRvYykKICAgICAgICAg cmV0dXJuIDA7CkBAIC00NDUsOSArNDUzLDIwIEBAICR7bmFtZXNwYWNlfUVsZW1lbnQgKiR7bmFt ZXNwYWNlfUVsZW1lbnRGYWN0b3J5OjpjcmVhdGUke25hbWVzcGFjZX1FbGVtZW50KGNvbnN0CiAg ICAgICAgIHJldHVybiBmdW5jKGRvYywgY3JlYXRlZEJ5UGFyc2VyKTsKIAogICAgIHJldHVybiBu ZXcgJHtuYW1lc3BhY2V9RWxlbWVudChxTmFtZSwgZG9jKTsKK0VORAorOworCitpZiAoISgkZ3Vh cmRGYWN0b3J5V2l0aCBlcSAiIikpIHsKK3ByaW50IEYgPDxFTkQKICNlbHNlCiAgICAgcmV0dXJu IDA7CiAjZW5kaWYKK0VORAorOworCit9CisKK3ByaW50IEYgPDxFTkQKIH0KIAogfSAvLyBuYW1l c3BhY2UK