32-bit build fix.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Apr 2015 00:09:44 +0000 (00:09 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Apr 2015 00:09:44 +0000 (00:09 +0000)
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::platformResetPreferencesToConsistentValues):
(WTR::TestController::platformConfigureViewForTest):
Added WK_API_ENABLED.

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

Tools/ChangeLog
Tools/WebKitTestRunner/mac/TestControllerMac.mm

index 95edfc1..946cabc 100644 (file)
@@ -1,5 +1,14 @@
 2015-04-16  Alex Christensen  <achristensen@webkit.org>
 
+        32-bit build fix.
+
+        * WebKitTestRunner/mac/TestControllerMac.mm:
+        (WTR::TestController::platformResetPreferencesToConsistentValues):
+        (WTR::TestController::platformConfigureViewForTest):
+        Added WK_API_ENABLED.
+
+2015-04-16  Alex Christensen  <achristensen@webkit.org>
+
         Removed unused WKUserContentFilterRef.
         https://bugs.webkit.org/show_bug.cgi?id=143852
 
index 40a49f8..0e42c4a 100644 (file)
@@ -84,7 +84,9 @@ static bool shouldUseThreadedScrolling(const TestInvocation& test)
 
 void TestController::platformResetPreferencesToConsistentValues()
 {
+#if WK_API_ENABLED
     [[_WKUserContentExtensionStore defaultStore] _removeAllContentExtensions];
+#endif
 }
 
 void TestController::platformConfigureViewForTest(const TestInvocation& test)
@@ -111,6 +113,7 @@ void TestController::platformConfigureViewForTest(const TestInvocation& test)
     if (!contentExtensionString)
         return;
     
+#if WK_API_ENABLED
     __block bool done = false;
     [[_WKUserContentExtensionStore defaultStore] compileContentExtensionForIdentifier:@"TestContentExtensions" encodedContentExtension:contentExtensionString completionHandler:^(_WKUserContentFilter *filter, NSError *error)
     {
@@ -119,6 +122,7 @@ void TestController::platformConfigureViewForTest(const TestInvocation& test)
         done = true;
     }];
     platformRunUntil(done, 0);
+#endif
 }
 
 void TestController::platformRunUntil(bool& done, double timeout)