107360 2013-01-18 22:56:05 -0800 Remove unnecessary PLATFORM() tests 2013-01-19 08:30:30 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 laszlo.gombos webkit-unassigned benjamin darin eric ojan.autocc webkit.review.bot oldest_to_newest 811309 0 laszlo.gombos 2013-01-18 22:56:05 -0800 PLATFORM(WIN) PLATFORM(CHROMIUM) and PLATFORM(QT) are mutually exclusive - only one of them can be true. In a few places we have tests like "PLATFORM(WIN) && !PLATFORM(CHROMIUM) && !PLATFORM(QT)". This is probably a left over from the times when PLATFORM(WIN) use to be OS(WIN). 811312 1 183605 laszlo.gombos 2013-01-18 22:59:54 -0800 Created attachment 183605 proposed change 811313 2 183605 eric 2013-01-18 23:01:43 -0800 Comment on attachment 183605 proposed change Because PLATFORM(WIN) means AppleWin? 811316 3 laszlo.gombos 2013-01-18 23:08:10 -0800 (In reply to comment #2) > (From update of attachment 183605 [details]) > Because PLATFORM(WIN) means AppleWin? Yes, indeed. 811317 4 laszlo.gombos 2013-01-18 23:09:49 -0800 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 183605 [details] [details]) > > Because PLATFORM(WIN) means AppleWin? > > Yes, indeed. These PLATFORM() macros are setup in Platform.h and from the definition it is clear that there are mutually exclusive. #if defined(BUILDING_CHROMIUM__) #define WTF_PLATFORM_CHROMIUM 1 #elif defined(BUILDING_QT__) #define WTF_PLATFORM_QT 1 #elif defined(BUILDING_WX__) #define WTF_PLATFORM_WX 1 #elif defined(BUILDING_EFL__) #define WTF_PLATFORM_EFL 1 #elif defined(BUILDING_GTK__) #define WTF_PLATFORM_GTK 1 #elif defined(BUILDING_BLACKBERRY__) #define WTF_PLATFORM_BLACKBERRY 1 #elif OS(DARWIN) #define WTF_PLATFORM_MAC 1 #elif OS(WINDOWS) #define WTF_PLATFORM_WIN 1 #endif 811318 5 183605 eric 2013-01-18 23:15:55 -0800 Comment on attachment 183605 proposed change OK. One of these years we should rename PLATFORM(MAC) and PLATFORM(WIN) to PLATFORM(APPLE_MAC) and APPLE_WIN to end the confusion. 811327 6 183605 webkit.review.bot 2013-01-18 23:50:10 -0800 Comment on attachment 183605 proposed change Clearing flags on attachment: 183605 Committed r140238: <http://trac.webkit.org/changeset/140238> 811328 7 webkit.review.bot 2013-01-18 23:50:14 -0800 All reviewed patches have been landed. Closing bug. 811415 8 darin 2013-01-19 08:30:30 -0800 (In reply to comment #5) > OK. One of these years we should rename PLATFORM(MAC) and PLATFORM(WIN) to PLATFORM(APPLE_MAC) and APPLE_WIN to end the confusion. Renaming is fine, but even though they seem different to you, I don’t think that most people would understand APPLE_MAC as distinct from MAC, so I think we have to think more on how to name. 183605 2013-01-18 22:59:54 -0800 2013-01-18 23:50:10 -0800 proposed change 107360.patch text/plain 1519 laszlo.gombos SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNDAyMzYpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTAxLTE4ICBMYXN6bG8gR29tYm9zICA8bC5n b21ib3NAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgUmVtb3ZlIHVubmVjZXNzYXJ5IFBMQVRGT1JN KCkgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwNzM2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFBMQVRGT1JNKFdJTiksIFBMQVRGT1JNKENIUk9NSVVNKSBhbmQgUExBVEZPUk0oUVQpIGFyZSBt dXR1YWxseQorICAgICAgICBleGNsdXNpdmUuIFJlbW92ZSByZWR1bmRhbnQgUExBVEZPUk0oKSB0 ZXN0cyBiYXNlZCBvbiB0aGlzCisgICAgICAgIGludmFyaWFudC4KKworICAgICAgICAqIHd0Zi9Q bGF0Zm9ybS5oOgorCiAyMDEzLTAxLTE4ICBMYXN6bG8gR29tYm9zICA8bC5nb21ib3NAc2Ftc3Vu Zy5jb20+CiAKICAgICAgICAgUmVtb3ZlIFBMQVRGT1JNKFRPUkNITU9CSUxFKSBmcm9tIEFzc2Vy dGlvbnMuaApJbmRleDogU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiAxNDAyMzMpCisrKyBTb3VyY2UvV1RG L3d0Zi9QbGF0Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC02MzUsNyArNjM1LDcgQEAKICNkZWZp bmUgV1RGX1VTRV9DRiAxCiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKFdJTikgJiYgIU9TKFdJTkNF KSAmJiAhUExBVEZPUk0oQ0hST01JVU0pICYmICFQTEFURk9STShXSU5fQ0FJUk8pCisjaWYgUExB VEZPUk0oV0lOKSAmJiAhT1MoV0lOQ0UpICYmICFQTEFURk9STShXSU5fQ0FJUk8pCiAjZGVmaW5l IFdURl9VU0VfQ0ZORVRXT1JLIDEKICNlbmRpZgogCkBAIC02NDMsMTEgKzY0MywxMSBAQAogI2Rl ZmluZSBXVEZfVVNFX0NGVVJMQ0FDSEUgMQogI2VuZGlmCiAKLSNpZiBQTEFURk9STShXSU4pICYm ICFPUyhXSU5DRSkgJiYgIVBMQVRGT1JNKENIUk9NSVVNKSAmJiAhUExBVEZPUk0oUVQpCisjaWYg UExBVEZPUk0oV0lOKSAmJiAhT1MoV0lOQ0UpCiAjZGVmaW5lIEVOQUJMRV9XRUJfQVJDSElWRSAx CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKFdJTikgJiYgIU9TKFdJTkNFKSAmJiAhUExBVEZPUk0o Q0hST01JVU0pICYmICFQTEFURk9STShXSU5fQ0FJUk8pICYmICFQTEFURk9STShRVCkKKyNpZiBQ TEFURk9STShXSU4pICYmICFPUyhXSU5DRSkgJiYgIVBMQVRGT1JNKFdJTl9DQUlSTykKICNkZWZp bmUgRU5BQkxFX0ZVTExTQ1JFRU5fQVBJIDEKICNlbmRpZgogCg==