Remove remaining PLATFORM(CHROMIUM) guards in TestWebKitAPI, WebKitTestRunner
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 6 Apr 2013 21:19:38 +0000 (21:19 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 6 Apr 2013 21:19:38 +0000 (21:19 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114083

Reviewed by Ryosuke Niwa.

Remove the remaining three occurrences of the PLATFORM(CHROMIUM) build guards
in TestWebKitAPI and WebKitTestRunner.

* TestWebKitAPI/config.h:
* TestWebKitAPI/mac/InjectedBundleControllerMac.mm:
(TestWebKitAPI::InjectedBundleController::platformInitialize):
* WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
(WTR::InjectedBundle::platformInitialize):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147853 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/TestWebKitAPI/config.h
Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm
Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm

index d53ead6..961d143 100644 (file)
@@ -1,3 +1,19 @@
+2013-04-06  Zan Dobersek  <zdobersek@igalia.com>
+
+        Remove remaining PLATFORM(CHROMIUM) guards in TestWebKitAPI, WebKitTestRunner
+        https://bugs.webkit.org/show_bug.cgi?id=114083
+
+        Reviewed by Ryosuke Niwa.
+
+        Remove the remaining three occurrences of the PLATFORM(CHROMIUM) build guards
+        in TestWebKitAPI and WebKitTestRunner.
+
+        * TestWebKitAPI/config.h:
+        * TestWebKitAPI/mac/InjectedBundleControllerMac.mm:
+        (TestWebKitAPI::InjectedBundleController::platformInitialize):
+        * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
+        (WTR::InjectedBundle::platformInitialize):
+
 2013-04-06  Geoffrey Garen  <ggaren@apple.com>
 
         Rolled out 147820 and 147818 because they caused plugins tests to ASSERT
index d4714cd..b382011 100644 (file)
@@ -70,7 +70,7 @@
 
 #include <stdint.h>
 
-#if !PLATFORM(IOS) && ((!PLATFORM(CHROMIUM) && !PLATFORM(WIN)) || (PLATFORM(GTK) && defined(BUILDING_WEBKIT2__)))
+#if !PLATFORM(IOS) && (!PLATFORM(WIN) || (PLATFORM(GTK) && defined(BUILDING_WEBKIT2__)))
 #include <WebKit2/WebKit2_C.h>
 #endif
 
index 965beb4..5d6712a 100644 (file)
@@ -40,7 +40,7 @@ void InjectedBundleController::platformInitialize()
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
                           [NSNumber numberWithInteger:4],   @"AppleAntiAliasingThreshold",
                           [NSNumber numberWithInteger:0],   @"AppleFontSmoothing",
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !PLATFORM(CHROMIUM)
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
                           [NSNumber numberWithBool:NO],     @"NSScrollAnimationEnabled",
 #else
                           [NSNumber numberWithBool:NO],     @"AppleScrollAnimationEnabled",
index 1ad19ae..282cce6 100644 (file)
@@ -42,7 +42,7 @@ void InjectedBundle::platformInitialize(WKTypeRef)
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
         [NSNumber numberWithInteger:4],   @"AppleAntiAliasingThreshold",
         [NSNumber numberWithInteger:0],   @"AppleFontSmoothing",
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !PLATFORM(CHROMIUM)
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
         [NSNumber numberWithBool:NO],     @"NSScrollAnimationEnabled",
 #else
         [NSNumber numberWithBool:NO],     @"AppleScrollAnimationEnabled",