Title: [195481] trunk/Tools
- Revision
- 195481
- Author
- [email protected]
- Date
- 2016-01-22 14:42:28 -0800 (Fri, 22 Jan 2016)
Log Message
Unreviewed build fix after http://trac.webkit.org/changeset/195474.
* WebKitTestRunner/cocoa/TestControllerCocoa.mm:
(WTR::TestController::platformCreateWebView):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (195480 => 195481)
--- trunk/Tools/ChangeLog 2016-01-22 22:41:12 UTC (rev 195480)
+++ trunk/Tools/ChangeLog 2016-01-22 22:42:28 UTC (rev 195481)
@@ -1,3 +1,10 @@
+2016-01-22 Enrica Casucci <[email protected]>
+
+ Unreviewed build fix after http://trac.webkit.org/changeset/195474.
+
+ * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+ (WTR::TestController::platformCreateWebView):
+
2016-01-22 Tim Horton <[email protected]>
Reproducible "Unhanded web process message 'WebUserContentController:AddUserScripts'" and friends
Modified: trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (195480 => 195481)
--- trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2016-01-22 22:41:12 UTC (rev 195480)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2016-01-22 22:42:28 UTC (rev 195481)
@@ -79,11 +79,15 @@
void TestController::platformCreateWebView(WKPageConfigurationRef, const TestOptions& options)
{
+#if WK_API_ENABLED
RetainPtr<WKWebViewConfiguration> copiedConfiguration = adoptNS([globalWebViewConfiguration copy]);
if (options.useDataDetection)
[copiedConfiguration setDataDetectorTypes:WKDataDetectorTypeAll];
m_mainWebView = std::make_unique<PlatformWebView>(copiedConfiguration.get(), options);
+#else
+ m_mainWebView = std::make_unique<PlatformWebView>(globalWebViewConfiguration, options);
+#endif
}
PlatformWebView* TestController::platformCreateOtherPage(PlatformWebView* parentView, WKPageConfigurationRef, const TestOptions& options)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
