Title: [182926] trunk/Tools
- Revision
- 182926
- Author
- achristen...@apple.com
- Date
- 2015-04-16 17:09:44 -0700 (Thu, 16 Apr 2015)
Log Message
32-bit build fix.
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::platformResetPreferencesToConsistentValues):
(WTR::TestController::platformConfigureViewForTest):
Added WK_API_ENABLED.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (182925 => 182926)
--- trunk/Tools/ChangeLog 2015-04-16 23:52:32 UTC (rev 182925)
+++ trunk/Tools/ChangeLog 2015-04-17 00:09:44 UTC (rev 182926)
@@ -1,5 +1,14 @@
2015-04-16 Alex Christensen <achristen...@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 <achristen...@webkit.org>
+
Removed unused WKUserContentFilterRef.
https://bugs.webkit.org/show_bug.cgi?id=143852
Modified: trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm (182925 => 182926)
--- trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2015-04-16 23:52:32 UTC (rev 182925)
+++ trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2015-04-17 00:09:44 UTC (rev 182926)
@@ -84,7 +84,9 @@
void TestController::platformResetPreferencesToConsistentValues()
{
+#if WK_API_ENABLED
[[_WKUserContentExtensionStore defaultStore] _removeAllContentExtensions];
+#endif
}
void TestController::platformConfigureViewForTest(const TestInvocation& test)
@@ -111,6 +113,7 @@
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 @@
done = true;
}];
platformRunUntil(done, 0);
+#endif
}
void TestController::platformRunUntil(bool& done, double timeout)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
