17683 2008-03-05 11:16:44 -0800 Standardize on #if USE(SAFARI_THEME) 2008-03-05 14:45:16 -0800 1 1 1 Unclassified WebKit WebKit Misc. 523.x (Safari 3) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 17675 1 bfulgham webkit-unassigned oldest_to_newest 72818 0 bfulgham 2008-03-05 11:16:44 -0800 Now that the SAFARI_THEME state is controlled by the wtf/Platform.h file, we should use this in preference to the manually defined macros in the various project files. This patch only modifies the source files. It does not modify the project files. For this, see http://bugs.webkit.org/show_bug.cgi?id=17675. 72822 1 19551 bfulgham 2008-03-05 11:46:04 -0800 Created attachment 19551 Update to properly conditionalize SAFARI_THEME Patch: * moves WTF_USE_SAFARI_THEME to a place where it actually gets defined * Modifies source files to use "#if USE(SAFARI_THEME)", rather than the USE_SAFARI_THEME currently hard-coded in project files. 72823 2 bfulgham 2008-03-05 11:47:48 -0800 I discovered while working on http://bugs.webkit.org/show_bug.cgi?id=17675 that the new USE(SAFARI_THEME) macro was not getting defined, and builds were only successful because "USE_SAFARI_THEME" is defined in the Visual Studio project file. This patch corrects the definition so that 17675 will work properly. 72824 3 19551 aroben 2008-03-05 11:49:57 -0800 Comment on attachment 19551 Update to properly conditionalize SAFARI_THEME r=me 72846 4 mrowe 2008-03-05 14:45:16 -0800 Landed in r30812. 19551 2008-03-05 11:46:04 -0800 2008-03-05 11:49:57 -0800 Update to properly conditionalize SAFARI_THEME UseSafari.patch text/plain 3859 bfulgham SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDMwODA2KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDgtMDMtMDUgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBnbWFpbC5jb20+CisKKyAgICAgICAgUmVtb3ZlIGRlZmluaXRpb24g b2YgV1RGX1VTRV9TQUZBUklfVEhFTUUgZnJvbSB3dGYvUGxhdGZvcm0uaAorICAgICAgICBiZWNh dXNlIHRoZSBQTEFURk9STShDRykgZmxhZyBpcyBub3Qgc2V0IHVudGlsIGNvbmZpZy5oIGhhcwor ICAgICAgICBhbHJlYWR5IGluY2x1ZGVkIHRoaXMgZmlsZS4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOiAgUmVtb3ZlIHVz ZWxlc3MgZGVmaW5pdGlvbiBvZiBXVEZfVVNFX1NBRkFSSV9USEVNRQorCiAyMDA4LTAzLTA1ICBB bmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgU2FtLgpJbmRleDogSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgJKHJldmlzaW9uIDMwODAwKQorKysgSmF2 YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgJKHdvcmtpbmcgY29weSkKQEAgLTExMiwxMCArMTEy LDYgQEAKICNkZWZpbmUgV1RGX1BMQVRGT1JNX0NBSVJPIDEKICNlbmRpZgogCi0jaWYgUExBVEZP Uk0oV0lOKSYmIFBMQVRGT1JNKENHKQotI2RlZmluZSBXVEZfVVNFX1NBRkFSSV9USEVNRSAxCi0j ZW5kaWYKLQogI2lmZGVmIF9fUzYwX18KIC8vIHdlIGFyZSBjcm9zcy1jb21waWxpbmcsIGl0IGlz IG5vdCByZWFsbHkgd2luZG93cwogI3VuZGVmIFdURl9QTEFURk9STV9XSU5fT1MKSW5kZXg6IFdl YkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lv biAzMDgwNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTcgQEAKKzIwMDgtMDMtMDUgIEJyZW50IEZ1bGdoYW0gPGJmdWxnaGFtQGdtYWlsLmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb2RpZnkgc291 cmNlIGZpbGVzIHRvIHVzZSB0aGUgVVNFKFNBRkFSSV9USEVNRSkgbWFjcm8sIHJhdGhlciB0aGFu CisgICAgICAgIFVTRV9TQUZBUklfVEhFTUUuICAoaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTc2ODMpCisKKyAgICAgICAgV0FSTklORzogTk8gVEVTVCBDQVNFUyBBRERF RCBPUiBDSEFOR0VECisKKyAgICAgICAgKiBXZWJDb3JlL3BsYXRmb3JtL3dpbi9QbGF0Zm9ybVNj cm9sbEJhclNhZmFyaS5jcHAKKyAgICAgICAgKiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZVNhZmFyaS5jcHAKKyAgICAgICAgKiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVNhZmFy aS5oCisgICAgICAgICogY29uZmlnLmg6IE1vdmUgZGVmaW5pdGlvbiBvZiBXVEZfVVNFX1NBRkFS SV9USEVNRSBoZXJlIAorCiAyMDA4LTAzLTA1ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNv bT4KIAogICAgICAgICBNb3ZlIFdlYkNvcmVTY3JpcHREZWJ1Z2dlciB1cCB0byBXZWJLaXQKSW5k ZXg6IFdlYkNvcmUvY29uZmlnLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9jb25maWcuaAkocmV2 aXNpb24gMzA4MDApCisrKyBXZWJDb3JlL2NvbmZpZy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDYs MyArMTQ2LDcgQEAgdHlwZWRlZiBmbG9hdCBDR0Zsb2F0OwogI3VuZGVmIEVOQUJMRV9GVFBESVIK ICNkZWZpbmUgRU5BQkxFX0ZUUERJUiAwCiAjZW5kaWYKKworI2lmIFBMQVRGT1JNKFdJTikgJiYg UExBVEZPUk0oQ0cpCisjZGVmaW5lIFdURl9VU0VfU0FGQVJJX1RIRU1FIDEKKyNlbmRpZgpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS93aW4vUGxhdGZvcm1TY3JvbGxCYXJTYWZhcmkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vd2luL1BsYXRmb3JtU2Nyb2xsQmFyU2FmYXJpLmNw cAkocmV2aXNpb24gMzA4MDApCisrKyBXZWJDb3JlL3BsYXRmb3JtL3dpbi9QbGF0Zm9ybVNjcm9s bEJhclNhZmFyaS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1LDcgKzI1LDcgQEAKIAogI2luY2x1 ZGUgImNvbmZpZy5oIgogCi0jaWZkZWYgVVNFX1NBRkFSSV9USEVNRSAKKyNpZiBVU0UoU0FGQVJJ X1RIRU1FKQogCiAjaW5jbHVkZSAiUGxhdGZvcm1TY3JvbGxCYXIuaCIKIApAQCAtNjU3LDQgKzY1 Nyw0IEBAIHZvaWQgUGxhdGZvcm1TY3JvbGxiYXI6OnRoZW1lQ2hhbmdlZCgpCiAKIH0KIAotI2Vu ZGlmIC8vIGRlZmluZWQoVVNFX1NBRkFSSV9USEVNRSkKKyNlbmRpZiAvLyBVU0UoU0FGQVJJX1RI RU1FKQpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVTYWZhcmkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmNwcAkocmV2aXNp b24gMzA4MDApCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVNhZmFyaS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTIxLDcgKzIxLDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJSZW5kZXJUaGVtZVNhZmFyaS5oIgogCi0jaWZkZWYgVVNFX1NBRkFSSV9USEVNRQorI2lm IFVTRShTQUZBUklfVEhFTUUpCiAKICNpbmNsdWRlICJDU1NWYWx1ZUtleXdvcmRzLmgiCiAjaW5j bHVkZSAiRG9jdW1lbnQuaCIKQEAgLTEyMjQsNCArMTIyNCw0IEBAIGJvb2wgUmVuZGVyVGhlbWVT YWZhcmk6OnBhaW50TWVkaWFTbGlkZXIKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCi0jZW5k aWYgLy8gZGVmaW5lZChVU0VfU0FGQVJJX1RIRU1FKQorI2VuZGlmIC8vICNpZiBVU0UoU0FGQVJJ X1RIRU1FKQpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVTYWZhcmkuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVNhZmFyaS5oCShyZXZpc2lv biAzMDgwMCkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmgJKHdvcmtp bmcgY29weSkKQEAgLTIxLDcgKzIxLDcgQEAKICNpZm5kZWYgUmVuZGVyVGhlbWVTYWZhcmlfaAog I2RlZmluZSBSZW5kZXJUaGVtZVNhZmFyaV9oCiAKLSNpZmRlZiBVU0VfU0FGQVJJX1RIRU1FCisj aWYgVVNFKFNBRkFSSV9USEVNRSkKIAogI2luY2x1ZGUgIlJlbmRlclRoZW1lLmgiCiAKQEAgLTE3 Niw2ICsxNzYsNiBAQCBwcml2YXRlOgogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKLSNlbmRp ZiAvLyBkZWZpbmVkKFVTRV9TQUZBUklfVEhFTUUpCisjZW5kaWYgLy8gI2lmIFVTRShTQUZBUklf VEhFTUUpCiAKICNlbmRpZiAvLyBSZW5kZXJUaGVtZVNhZmFyaV9oCg==