Title: [201025] branches/safari-602.1.32-branch/Tools
Diff
Modified: branches/safari-602.1.32-branch/Tools/ChangeLog (201024 => 201025)
--- branches/safari-602.1.32-branch/Tools/ChangeLog 2016-05-17 18:48:53 UTC (rev 201024)
+++ branches/safari-602.1.32-branch/Tools/ChangeLog 2016-05-17 18:48:55 UTC (rev 201025)
@@ -1,3 +1,14 @@
+2016-05-17 Babak Shafiei <[email protected]>
+
+ Merge r200669.
+
+ 2016-05-10 Dan Bernstein <[email protected]>
+
+ Tried to fix the Mac build after r200668.
+
+ * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+ (WTR::TestController::platformCreateWebView):
+
2016-05-11 Babak Shafiei <[email protected]>
Merge r200659.
Modified: branches/safari-602.1.32-branch/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (201024 => 201025)
--- branches/safari-602.1.32-branch/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2016-05-17 18:48:53 UTC (rev 201024)
+++ branches/safari-602.1.32-branch/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2016-05-17 18:48:55 UTC (rev 201025)
@@ -82,8 +82,10 @@
{
#if WK_API_ENABLED
RetainPtr<WKWebViewConfiguration> copiedConfiguration = adoptNS([globalWebViewConfiguration copy]);
+#if TARGET_OS_IPHONE
if (options.useDataDetection)
[copiedConfiguration setDataDetectorTypes:WKDataDetectorTypeAll];
+#endif
m_mainWebView = std::make_unique<PlatformWebView>(copiedConfiguration.get(), options);
#else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
