17807 2008-03-12 14:16:05 -0700 CSSPropertyNames.h is included in a .c file, but uses C++ features 2008-03-13 20:45:45 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mark eric ap oldest_to_newest 73507 0 mark 2008-03-12 14:16:05 -0700 CSSPropertyNames.h, built by WebCore/css/makeprop.pl, should be generated as C source. makeprop.pl also generates CSSPropertyNames.c, which includes CSSPropertyNames.h, and the use of a C++ism in CSSPropertyNames.h will cause compilation to fail if the .c file is, as its extension implies, built as straight C source. The problem is that the generated CSSPropertyNames.h file uses "enum CSSPropertyID", but CSSPropertyNames.c references it as "CSSPropertyID" without the enum. In C++, this is valid, but in C, it is not valid without a typedef. Using a typedef in the .h file would allow the enum to be accessed consistently by C and C++ source. Alternatively, the .c file should be changed to reference CSSPropertyID as "enum CSSPropertyID". 73509 1 19711 mark 2008-03-12 14:18:40 -0700 Created attachment 19711 Use "typedef enum" in makeprop.pl, which generates CSSPropertyNames.{h,c} 73511 2 19711 darin 2008-03-12 14:24:55 -0700 Comment on attachment 19711 Use "typedef enum" in makeprop.pl, which generates CSSPropertyNames.{h,c} This patch isn't really a good idea. Instead the generated file should be changed to CSSPropertyNames.cpp. We have no reason to use C instead of C++ for part of WebKit. 73520 3 19716 mark 2008-03-12 14:49:56 -0700 Created attachment 19716 Move CSSPropertyNames.c to CSSPropertyNames.cpp 73524 4 19716 eric 2008-03-12 15:09:33 -0700 Comment on attachment 19716 Move CSSPropertyNames.c to CSSPropertyNames.cpp Looks good to me. r=me. I would leave this to Darin as he commented originally, but this patch is simple enough I feel I can just r+ anyway. I don't see why it matters what the extension is though, since it's just included in another .cpp file. 73666 5 eric 2008-03-13 20:45:45 -0700 Thank you mark for making such easy-to-land patches. These took only a few minutes to land on my train ride home. :) These are revisions r31048 through r31053 19711 2008-03-12 14:18:40 -0700 2008-03-12 14:49:56 -0700 Use "typedef enum" in makeprop.pl, which generates CSSPropertyNames.{h,c} webkit-17807.1.patch text/plain 1066 mark SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDMxMDA1 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTAgQEAKKzIwMDgtMDMt MTIgIE1hcmsgTWVudG92YWkgIDxtYXJrQG1veGllbmV0LmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNzcy9tYWtlcHJvcC5wbDogVXNlICJ0 eXBlZGVmIGVudW0gey4uLn0gQ1NTUHJvcGVydHlJRCIgZm9yIEMKKwkgIGNvbXBhdGliaWxpdHku CisKIDIwMDgtMDMtMTIgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAg IE1ha2UgdGhlIHpvb20gZmFjdG9yIGEgZmxvYXQgYW5kIG5vdCBhIHBlcmNlbnQuCkluZGV4OiBj c3MvbWFrZXByb3AucGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gY3NzL21ha2Vwcm9wLnBsCShyZXZpc2lvbiAz MTAwNCkKKysrIGNzcy9tYWtlcHJvcC5wbAkod29ya2luZyBjb3B5KQpAQCAtNjEsNyArNjEsNyBA QCBwcmludCBIRUFERVIgPDwgIkVPRiI7CiAjaWZuZGVmIENTU1Byb3BlcnR5TmFtZXNfaAogI2Rl ZmluZSBDU1NQcm9wZXJ0eU5hbWVzX2gKIAotZW51bSBDU1NQcm9wZXJ0eUlEIHsKK3R5cGVkZWYg ZW51bSB7CiAgICAgQ1NTX1BST1BfSU5WQUxJRCA9IDAsCiBFT0YKIApAQCAtNzYsNyArNzYsNyBA QCBmb3JlYWNoIG15ICRuYW1lIChAbmFtZXMpIHsKICAgICAkbWF4TGVuID0gbGVuZ3RoKCRuYW1l KTsKICAgfQogfQotcHJpbnQgSEVBREVSICJ9O1xuXG4iOworcHJpbnQgSEVBREVSICJ9IENTU1By b3BlcnR5SUQ7XG5cbiI7CiBwcmludCBIRUFERVIgImNvbnN0IGludCBudW1DU1NQcm9wZXJ0aWVz ID0gIiAuICRpIC4gIjtcbiI7CiBwcmludCBIRUFERVIgImNvbnN0IHNpemVfdCBtYXhDU1NQcm9w ZXJ0eU5hbWVMZW5ndGggPSAiIC4gJG1heExlbiAuICI7XG4iOwogCg== 19716 2008-03-12 14:49:56 -0700 2008-03-12 15:09:33 -0700 Move CSSPropertyNames.c to CSSPropertyNames.cpp webkit-17807.2.patch text/plain 3918 mark SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDMxMDA3 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDgtMDMt MTIgIE1hcmsgTWVudG92YWkgIDxtYXJrQG1veGllbmV0LmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvajoKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAgKiBjc3Mv bWFrZXByb3AucGw6CisJTW92ZSBDU1NQcm9wZXJ0eU5hbWVzLmMgdG8gQ1NTUHJvcGVydHlOYW1l cy5jcHAKKwogMjAwOC0wMy0xMiAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAg ICAgICAgTWFrZSBmdWxsIHBhZ2Ugem9vbSB2YWd1ZWx5IHdvcmsuICBUaGlzIHBhdGNoIHVzZXMg dGhlIENTUyB0cmFuc2Zvcm0gc3lzdGVtIHRvIHR1cm4gb24gZnVsbCBwYWdlIHpvb20gYXQgdGhl CkluZGV4OiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAzMTAwNCkKKysrIFdl YkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtNDg2Niw3 ICs0ODY2LDcgQEAKIAkJNjU1MEI2OUEwOTlERjAyNzAwOTBENzgxIC8qIEVkaXRpbmdUZXh0Lmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBFZGl0aW5nVGV4dC5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQk2NTUwQjY5QjA5OURGMDI3MDA5MEQ3ODEgLyogVGV4dC5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gVGV4dC5jcHA7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTY1NTBCNjlDMDk5REYwMjcwMDkwRDc4MSAvKiBUZXh0 LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBUZXh0Lmg7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07Ci0JCTY1NjU4MEVEMDlEMTJCMjAwMDBFNjFENyAvKiBDU1NQcm9wZXJ0 eU5hbWVzLmMgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmM7IHBhdGggPSBDU1NQcm9wZXJ0eU5h bWVzLmM7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTY1NjU4MEVEMDlEMTJCMjAwMDBF NjFENyAvKiBDU1NQcm9wZXJ0eU5hbWVzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j cHA7IHBhdGggPSBDU1NQcm9wZXJ0eU5hbWVzLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJNjU2NTgwRUUwOUQxMkIyMDAwMEU2MUQ3IC8qIENTU1Byb3BlcnR5TmFtZXMuZ3BlcmYg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93 bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IENTU1Byb3BlcnR5TmFtZXMuZ3BlcmY7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTY1NjU4MEVGMDlEMTJCMjAwMDBFNjFENyAvKiBDU1NQcm9w ZXJ0eU5hbWVzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g MzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBDU1NQcm9wZXJ0 eU5hbWVzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTY1NjU4MTFDMDlEMTJEQjIw MDBFNjFENyAvKiBEb2NUeXBlU3RyaW5ncy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAu Y3BwOyBwYXRoID0gRG9jVHlwZVN0cmluZ3MuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwpAQCAtODQ4MSw3ICs4NDgxLDcgQEAKIAkJCQk2NTY1ODFBRDA5RDE0RUU2MDAwRTYxRDcgLyog Q29sb3JEYXRhLmMgKi8sCiAJCQkJNjU2NTgxNDQwOUQxMzA0MzAwMEU2MUQ3IC8qIENTU0dyYW1t YXIuY3BwICovLAogCQkJCTY1MEY1M0RCMDlEMTVEREEwMEM5QjBDOCAvKiBDU1NHcmFtbWFyLmgg Ki8sCi0JCQkJNjU2NTgwRUQwOUQxMkIyMDAwMEU2MUQ3IC8qIENTU1Byb3BlcnR5TmFtZXMuYyAq LywKKwkJCQk2NTY1ODBFRDA5RDEyQjIwMDAwRTYxRDcgLyogQ1NTUHJvcGVydHlOYW1lcy5jcHAg Ki8sCiAJCQkJNjU2NTgwRUUwOUQxMkIyMDAwMEU2MUQ3IC8qIENTU1Byb3BlcnR5TmFtZXMuZ3Bl cmYgKi8sCiAJCQkJNjU2NTgwRUYwOUQxMkIyMDAwMEU2MUQ3IC8qIENTU1Byb3BlcnR5TmFtZXMu aCAqLywKIAkJCQk2NTY1ODE0NjA5RDEzMDQzMDAwRTYxRDcgLyogQ1NTVmFsdWVLZXl3b3Jkcy5j ICovLApJbmRleDogY3NzL0NTU1BhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gY3NzL0NTU1BhcnNl ci5jcHAJKHJldmlzaW9uIDMxMDA0KQorKysgY3NzL0NTU1BhcnNlci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTcxLDcgKzcxLDcgQEAgZXh0ZXJuIGludCBjc3N5eXBhcnNlKHZvaWQqIHBhcnNlcik7 CiB1c2luZyBuYW1lc3BhY2Ugc3RkOwogdXNpbmcgbmFtZXNwYWNlIFdURjsKIAotI2luY2x1ZGUg IkNTU1Byb3BlcnR5TmFtZXMuYyIKKyNpbmNsdWRlICJDU1NQcm9wZXJ0eU5hbWVzLmNwcCIKICNp bmNsdWRlICJDU1NWYWx1ZUtleXdvcmRzLmMiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKSW5kZXg6 IGNzcy9tYWtlcHJvcC5wbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBjc3MvbWFrZXByb3AucGwJKHJldmlzaW9u IDMxMDA0KQorKysgY3NzL21ha2Vwcm9wLnBsCSh3b3JraW5nIGNvcHkpCkBAIC04OSw5ICs4OSw5 IEBAIEVPRgogCiBjbG9zZSBIRUFERVI7CiAKLXN5c3RlbSgiZ3BlcmYgLWEgLUwgQU5TSS1DIC1F IC1DIC1jIC1vIC10IC0ta2V5LXBvc2l0aW9ucz1cIipcIiAtTmZpbmRQcm9wIC1IaGFzaF9wcm9w IC1Xd29yZGxpc3RfcHJvcCAtRCAtcyAyIENTU1Byb3BlcnR5TmFtZXMuZ3BlcmYgPiBDU1NQcm9w ZXJ0eU5hbWVzLmMiKTsKK3N5c3RlbSgiZ3BlcmYgLWEgLUwgQU5TSS1DIC1FIC1DIC1jIC1vIC10 IC0ta2V5LXBvc2l0aW9ucz1cIipcIiAtTmZpbmRQcm9wIC1IaGFzaF9wcm9wIC1Xd29yZGxpc3Rf cHJvcCAtRCAtcyAyIENTU1Byb3BlcnR5TmFtZXMuZ3BlcmYgPiBDU1NQcm9wZXJ0eU5hbWVzLmNw cCIpOwogCi1vcGVuIEMsICI+PkNTU1Byb3BlcnR5TmFtZXMuYyIgfHwgZGllICJDb3VsZCBub3Qg b3BlbiBDU1NQcm9wZXJ0eU5hbWVzLmMgZm9yIHdyaXRpbmciOworb3BlbiBDLCAiPj5DU1NQcm9w ZXJ0eU5hbWVzLmNwcCIgfHwgZGllICJDb3VsZCBub3Qgb3BlbiBDU1NQcm9wZXJ0eU5hbWVzLmNw cCBmb3Igd3JpdGluZyI7CiBwcmludCBDICAic3RhdGljIGNvbnN0IGNoYXIgKiBjb25zdCBwcm9w ZXJ0eUxpc3RbXSA9IHtcbiI7CiBwcmludCBDICAiXCJcIixcbiI7CiAK