76923 2012-01-24 10:22:26 -0800 [Refactoring] In CodeGeneratorGObject.pm, merge GeneratePrivateHeader() into WriteData() 2012-01-24 13:44:05 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76836 1 haraken haraken abarth darin japhet mrobinson webkit.review.bot oldest_to_newest 541436 0 haraken 2012-01-24 10:22:26 -0800 This is one of steps to stop rebuilding .h/.cpp files generated by unchanged IDLs (bug 76836). In CodeGeneratorGObject.pm, we can merge GeneratePrivateHeader() into WriteData(), so that all code to output .h/.cpp is managed by WriteData(), just like other CodeGenerator*.pm does. 541469 1 123768 haraken 2012-01-24 10:48:07 -0800 Created attachment 123768 Patch 541634 2 123768 webkit.review.bot 2012-01-24 13:44:00 -0800 Comment on attachment 123768 Patch Clearing flags on attachment: 123768 Committed r105803: <http://trac.webkit.org/changeset/105803> 541635 3 webkit.review.bot 2012-01-24 13:44:05 -0800 All reviewed patches have been landed. Closing bug. 123768 2012-01-24 10:48:07 -0800 2012-01-24 13:44:00 -0800 Patch bug-76923-20120124104806.patch text/plain 6081 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1NzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmI2OWIxZjc1YjYyNGVh ODMyNDNhYjNjNTAwNDJiYzFjYzdjZTA5ZC4uNzg3M2U2YzU4NmYzNzYyNmU3ODcyMGJkZjViNDVk Nzg5ZDMzMWVkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAxLTI0ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbUmVmYWN0b3Jpbmdd IEluIENvZGVHZW5lcmF0b3JHT2JqZWN0LnBtLCBtZXJnZQorICAgICAgICBHZW5lcmF0ZVByaXZh dGVIZWFkZXIoKSBpbnRvIFdyaXRlRGF0YSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03NjkyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggbWVyZ2VzIEdlbmVyYXRlUHJpdmF0ZUhlYWRl cigpIGludG8gV3JpdGVEYXRhKCksCisgICAgICAgIHNvIHRoYXQgYWxsIGNvZGUgdG8gb3V0cHV0 IC5oLy5jcHAgaXMgbWFuYWdlZCBieSBXcml0ZURhdGEoKSwKKyAgICAgICAganVzdCBsaWtlIG90 aGVyIENvZGVHZW5lcmF0b3IqLnBtIGRvZXMuCisKKyAgICAgICAgTm8gdGVzdHMuIE5vIGNoYW5n ZSBpbiBiZWhhdmlvci4KKyAgICAgICAgQ29uZmlybSB0aGF0IEdUSy9HT2JqZWN0IGJ1aWxkIHBh c3Nlcy4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3Qu cG06CisgICAgICAgIChHZW5lcmF0ZSk6CisgICAgICAgIChXcml0ZURhdGEpOiBDb3BpZWQgR2Vu ZXJhdGVQcml2YXRlSGVhZGVyKCkgdG8gaGVyZS4KKyAgICAgICAgUmVtb3ZlZCAkaGFzTGVnYWN5 UGFyZW4sICRoYXNSZWFsUGFyZW50IGFuZCAkaGFzUGFyZW50CisgICAgICAgIHNpbmNlIHRoZXkg YXJlIG5vdCB1c2VkLgorICAgICAgICAoR2VuZXJhdGVJbnRlcmZhY2UpOgorCiAyMDEyLTAxLTI0 ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBb R1RLXSBSZWZhY3RvciBHVEsncyBhY2Nlc3NpYmlsaXRpdHkgY29kZSB0byBiZSBtb3JlIG1vZHVs YXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvckdPYmplY3QucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5l cmF0b3JHT2JqZWN0LnBtCmluZGV4IDcwMmU4ZTZjODRiMzkyYjcyMDg3NDZlYmE3ZWE5NmM2ZjQ3 ZjhiOTQuLmIyODhjMjEwNDVlNWJmMWQ3ZTk5NThjYjhiNmY4Zjk1YjVkZTBjMzcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3Qu cG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09i amVjdC5wbQpAQCAtMTE3Miw2OCArMTE3Miw2IEBAIHN1YiBHZW5lcmF0ZUVuZEhlYWRlciB7CiAg ICAgcHVzaChAaFByZWZpeEd1YXJkRW5kLCAiI2VuZGlmIC8qICRndWFyZCAqL1xuIik7CiB9CiAK LXN1YiBHZW5lcmF0ZVByaXZhdGVIZWFkZXIgewotICAgIG15ICRvYmplY3QgPSBzaGlmdDsKLSAg ICBteSAkZGF0YU5vZGUgPSBzaGlmdDsKLQotICAgIG15ICRpbnRlcmZhY2VOYW1lID0gJGRhdGFO b2RlLT5uYW1lOwotICAgIG15ICRmaWxlbmFtZSA9ICIkb3V0cHV0RGlyLyIgLiAkY2xhc3NOYW1l IC4gIlByaXZhdGUuaCI7Ci0gICAgbXkgJGd1YXJkID0gdWMoZGVjYW1lbGl6ZSgkY2xhc3NOYW1l KSkgLiAiX1BSSVZBVEVfSCI7Ci0gICAgbXkgJHBhcmVudENsYXNzTmFtZSA9IEdldFBhcmVudENs YXNzTmFtZSgkZGF0YU5vZGUpOwotICAgIG15ICRoYXNMZWdhY3lQYXJlbnQgPSAkZGF0YU5vZGUt PmV4dGVuZGVkQXR0cmlidXRlcy0+eyJMZWdhY3lQYXJlbnQifTsKLSAgICBteSAkaGFzUmVhbFBh cmVudCA9IEB7JGRhdGFOb2RlLT5wYXJlbnRzfSA+IDA7Ci0gICAgbXkgJGhhc1BhcmVudCA9ICRo YXNMZWdhY3lQYXJlbnQgfHwgJGhhc1JlYWxQYXJlbnQ7Ci0gICAgCi0gICAgb3BlbihQUklWSEVB REVSLCAiPiRmaWxlbmFtZSIpIG9yIGRpZSAiQ291bGRuJ3Qgb3BlbiBmaWxlICRmaWxlbmFtZSBm b3Igd3JpdGluZyI7Ci0gICAgCi0gICAgcHJpbnQgUFJJVkhFQURFUiBzcGxpdCgiXHIiLCAkbGlj ZW5jZVRlbXBsYXRlKTsKLSAgICBwcmludCBQUklWSEVBREVSICJcbiI7Ci0gICAgCi0gICAgbXkg JHRleHQgPSA8PCAiRU9GIjsKLSNpZm5kZWYgJGd1YXJkCi0jZGVmaW5lICRndWFyZAotCi0jaW5j bHVkZSA8Z2xpYi1vYmplY3QuaD4KLSNpbmNsdWRlIDx3ZWJraXQvJHtwYXJlbnRDbGFzc05hbWV9 Lmg+Ci0jaW5jbHVkZSAiJHtpbnRlcmZhY2VOYW1lfS5oIgotRU9GCi0KLSAgICBwcmludCBQUklW SEVBREVSICR0ZXh0OwotICAgIAotICAgIHByaW50IFBSSVZIRUFERVIgbWFwIHsgIiNpbmNsdWRl IFwiJF9cIlxuIiB9IHNvcnQga2V5cyglaGRyUHJvcEluY2x1ZGVzKTsKLSAgICBwcmludCBQUklW SEVBREVSICJcbiIgaWYga2V5cyglaGRyUHJvcEluY2x1ZGVzKTsKLSAgICAKLSAgICAkdGV4dCA9 IDw8ICJFT0YiOwotbmFtZXNwYWNlIFdlYktpdCB7Ci0gICAgJHtjbGFzc05hbWV9ICoKLSAgICB3 cmFwJHtpbnRlcmZhY2VOYW1lfShXZWJDb3JlOjoke2ludGVyZmFjZU5hbWV9ICpjb3JlT2JqZWN0 KTsKLQotICAgIFdlYkNvcmU6OiR7aW50ZXJmYWNlTmFtZX0gKgotICAgIGNvcmUoJHtjbGFzc05h bWV9ICpyZXF1ZXN0KTsKLQotRU9GCi0KLSAgICBwcmludCBQUklWSEVBREVSICR0ZXh0OwotCi0g ICAgaWYgKCRjbGFzc05hbWUgbmUgIldlYktpdERPTU5vZGUiKSB7Ci0gICAgICAgICR0ZXh0ID0g PDwgIkVPRiI7Ci0gICAgJHtjbGFzc05hbWV9KgotICAgIGtpdChXZWJDb3JlOjoke2ludGVyZmFj ZU5hbWV9KiBub2RlKTsKLQotRU9GCi0gICAgICAgIHByaW50IFBSSVZIRUFERVIgJHRleHQ7Ci0g ICAgfQotCi0gICAgJHRleHQgPSA8PCAiRU9GIjsKLX0gLy8gbmFtZXNwYWNlIFdlYktpdAotCi0j ZW5kaWYgLyogJHtndWFyZH0gKi8KLUVPRgotICAgIHByaW50IFBSSVZIRUFERVIgJHRleHQ7Ci0K LSAgICBjbG9zZShQUklWSEVBREVSKTsKLX0KLQogc3ViIFVzZXNNYW51YWxLaXRJbXBsZW1lbnRh dGlvbiB7CiAgICAgbXkgJHR5cGUgPSBzaGlmdDsKIApAQCAtMTM0OSwxNiArMTI4Nyw3MSBAQCBF T0YKICAgICAkb2JqZWN0LT5HZW5lcmF0ZUhlYWRlcigkaW50ZXJmYWNlTmFtZSwgJHBhcmVudENs YXNzTmFtZSk7CiAgICAgJG9iamVjdC0+R2VuZXJhdGVDRmlsZSgkaW50ZXJmYWNlTmFtZSwgJHBh cmVudENsYXNzTmFtZSwgJHBhcmVudEdPYmpUeXBlLCAkZGF0YU5vZGUpOwogICAgICRvYmplY3Qt PkdlbmVyYXRlRW5kSGVhZGVyKCk7Ci0gICAgJG9iamVjdC0+R2VuZXJhdGVQcml2YXRlSGVhZGVy KCRkYXRhTm9kZSk7Ci0KIH0KIAogIyBJbnRlcm5hbCBoZWxwZXIKIHN1YiBXcml0ZURhdGEgewot ICAgIG15ICgkb2JqZWN0LCAkbmFtZSkgPSBAXzsKKyAgICBteSAkb2JqZWN0ID0gc2hpZnQ7Cisg ICAgbXkgJGRhdGFOb2RlID0gc2hpZnQ7CisKKyAgICAjIFdyaXRlIGEgcHJpdmF0ZSBoZWFkZXIu CisgICAgbXkgJGludGVyZmFjZU5hbWUgPSAkZGF0YU5vZGUtPm5hbWU7CisgICAgbXkgJGZpbGVu YW1lID0gIiRvdXRwdXREaXIvIiAuICRjbGFzc05hbWUgLiAiUHJpdmF0ZS5oIjsKKyAgICBteSAk Z3VhcmQgPSB1YyhkZWNhbWVsaXplKCRjbGFzc05hbWUpKSAuICJfUFJJVkFURV9IIjsKKyAgICBt eSAkcGFyZW50Q2xhc3NOYW1lID0gR2V0UGFyZW50Q2xhc3NOYW1lKCRkYXRhTm9kZSk7CisKKyAg ICBvcGVuKFBSSVZIRUFERVIsICI+JGZpbGVuYW1lIikgb3IgZGllICJDb3VsZG4ndCBvcGVuIGZp bGUgJGZpbGVuYW1lIGZvciB3cml0aW5nIjsKKworICAgIHByaW50IFBSSVZIRUFERVIgc3BsaXQo IlxyIiwgJGxpY2VuY2VUZW1wbGF0ZSk7CisgICAgcHJpbnQgUFJJVkhFQURFUiAiXG4iOworCisg ICAgbXkgJHRleHQgPSA8PCAiRU9GIjsKKyNpZm5kZWYgJGd1YXJkCisjZGVmaW5lICRndWFyZAor CisjaW5jbHVkZSA8Z2xpYi1vYmplY3QuaD4KKyNpbmNsdWRlIDx3ZWJraXQvJHtwYXJlbnRDbGFz c05hbWV9Lmg+CisjaW5jbHVkZSAiJHtpbnRlcmZhY2VOYW1lfS5oIgorRU9GCisKKyAgICBwcmlu dCBQUklWSEVBREVSICR0ZXh0OworICAgIHByaW50IFBSSVZIRUFERVIgbWFwIHsgIiNpbmNsdWRl IFwiJF9cIlxuIiB9IHNvcnQga2V5cyglaGRyUHJvcEluY2x1ZGVzKTsKKyAgICBwcmludCBQUklW SEVBREVSICJcbiIgaWYga2V5cyglaGRyUHJvcEluY2x1ZGVzKTsKKyAgICAkdGV4dCA9IDw8ICJF T0YiOworbmFtZXNwYWNlIFdlYktpdCB7CisgICAgJHtjbGFzc05hbWV9ICoKKyAgICB3cmFwJHtp bnRlcmZhY2VOYW1lfShXZWJDb3JlOjoke2ludGVyZmFjZU5hbWV9ICpjb3JlT2JqZWN0KTsKKwor ICAgIFdlYkNvcmU6OiR7aW50ZXJmYWNlTmFtZX0gKgorICAgIGNvcmUoJHtjbGFzc05hbWV9ICpy ZXF1ZXN0KTsKKworRU9GCisKKyAgICBwcmludCBQUklWSEVBREVSICR0ZXh0OworCisgICAgaWYg KCRjbGFzc05hbWUgbmUgIldlYktpdERPTU5vZGUiKSB7CisgICAgICAgICR0ZXh0ID0gPDwgIkVP RiI7CisgICAgJHtjbGFzc05hbWV9KgorICAgIGtpdChXZWJDb3JlOjoke2ludGVyZmFjZU5hbWV9 KiBub2RlKTsKKworRU9GCisgICAgICAgIHByaW50IFBSSVZIRUFERVIgJHRleHQ7CisgICAgfQor CisgICAgJHRleHQgPSA8PCAiRU9GIjsKK30gLy8gbmFtZXNwYWNlIFdlYktpdAorCisjZW5kaWYg LyogJHtndWFyZH0gKi8KK0VPRgorICAgIHByaW50IFBSSVZIRUFERVIgJHRleHQ7CisKKyAgICBj bG9zZShQUklWSEVBREVSKTsKKworICAgIG15ICRiYXNlbmFtZSA9IEZpbGVOYW1lUHJlZml4IC4g JGludGVyZmFjZU5hbWU7CisgICAgJGJhc2VuYW1lID1+IHMvXy8vZzsKIAogICAgICMgV3JpdGUg cHVibGljIGhlYWRlci4KLSAgICBteSAkaGRyRk5hbWUgPSAiJG91dHB1dERpci8iIC4gJG5hbWUg LiAiLmgiOworICAgIG15ICRoZHJGTmFtZSA9ICIkb3V0cHV0RGlyLyIgLiAkYmFzZW5hbWUgLiAi LmgiOwogICAgIG9wZW4oSEVBREVSLCAiPiRoZHJGTmFtZSIpIG9yIGRpZSAiQ291bGRuJ3Qgb3Bl biBmaWxlICRoZHJGTmFtZSI7CiAKICAgICBwcmludCBIRUFERVIgQGhQcmVmaXg7CkBAIC0xMzc2 LDcgKzEzNjksNyBAQCBzdWIgV3JpdGVEYXRhIHsKICAgICBjbG9zZShIRUFERVIpOwogCiAgICAg IyBXcml0ZSB0aGUgaW1wbGVtZW50YXRpb24gc291cmNlcwotICAgIG15ICRpbXBsRmlsZU5hbWUg PSAiJG91dHB1dERpci8iIC4gJG5hbWUgLiAiLmNwcCI7CisgICAgbXkgJGltcGxGaWxlTmFtZSA9 ICIkb3V0cHV0RGlyLyIgLiAkYmFzZW5hbWUgLiAiLmNwcCI7CiAgICAgb3BlbihJTVBMLCAiPiRp bXBsRmlsZU5hbWUiKSBvciBkaWUgIkNvdWxkbid0IG9wZW4gZmlsZSAkaW1wbEZpbGVOYW1lIjsK IAogICAgIHByaW50IElNUEwgQGNQcmVmaXg7CkBAIC0xNDA3LDE2ICsxNDAwLDEyIEBAIHN1YiBX cml0ZURhdGEgewogCiBzdWIgR2VuZXJhdGVJbnRlcmZhY2UgewogICAgIG15ICgkb2JqZWN0LCAk ZGF0YU5vZGUsICRkZWZpbmVzKSA9IEBfOwotICAgIG15ICRuYW1lID0gJGRhdGFOb2RlLT5uYW1l OwogCiAgICAgIyBTZXQgdXAgc29tZSBnbG9iYWwgdmFyaWFibGVzCiAgICAgJGNsYXNzTmFtZSA9 IEdldENsYXNzTmFtZSgkZGF0YU5vZGUtPm5hbWUpOwotICAgICRvYmplY3QtPkdlbmVyYXRlKCRk YXRhTm9kZSk7CiAKLSAgICAjIFdyaXRlIGNoYW5nZXMKLSAgICBteSAkZm5hbWUgPSBGaWxlTmFt ZVByZWZpeCAuICRuYW1lOwotICAgICRmbmFtZSA9fiBzL18vL2c7Ci0gICAgJG9iamVjdC0+V3Jp dGVEYXRhKCRmbmFtZSk7CisgICAgJG9iamVjdC0+R2VuZXJhdGUoJGRhdGFOb2RlKTsKKyAgICAk b2JqZWN0LT5Xcml0ZURhdGEoJGRhdGFOb2RlKTsKIH0KIAogMTsK