Changeset 205094 in webkit

Timestamp:

Aug 27, 2016 6:27:41 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

WTR needs an implementation of setAutomaticLinkDetectionEnabled
​https://bugs.webkit.org/show_bug.cgi?id=87162

Patch by Jonathan Bedard <Jonathan Bedard> on 2016-08-27
Source/WebKit2:

Reviewed by Darin Adler

• WebProcess/InjectedBundle/API/c/WKBundle.cpp:

(WKBundleSetAutomaticLinkDetectionEnabled): Added WKBundleSetAutomaticLinkDetectionEnabled definition.

• WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: Added WKBundleSetAutomaticLinkDetectionEnabled declaration.
• WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::setAutomaticLinkDetectionEnabled): Added setAutomaticLinkDetectionEnabled definition.

• WebProcess/InjectedBundle/InjectedBundle.h: Added setAutomaticLinkDetectionEnabled declaration.
• WebProcess/WebProcess.h: Declared setTextCheckerState public.

Tools:

Reviewed by Darin Adler.

• WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl: Added setAutomaticLinkDetectionEnabled binding.
• WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:

(WTR::InjectedBundle::beginTesting): Set automatic link detection to false by default.

• WebKitTestRunner/InjectedBundle/TestRunner.cpp:

(WTR::TestRunner::setAutomaticLinkDetectionEnabled): Added setAutomaticLinkDetectionEnabled definition.

• WebKitTestRunner/InjectedBundle/TestRunner.h: Added setAutomaticLinkDetectionEnabled declaration.

LayoutTests:

Reviewed by Darin Adler.

• platform/wk2/TestExpectations: Removed 2 now passing tests.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/wk2/TestExpectations (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (3 diffs)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (modified) (1 diff)
• Source/WebKit2/WebProcess/WebProcess.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-08-27  Jonathan Bedard  <jbedard@apple.com>
+
+        WTR needs an implementation of setAutomaticLinkDetectionEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=87162
+
+        Reviewed by Darin Adler.
+
+        * platform/wk2/TestExpectations: Removed 2 now passing tests.
+
 2016-08-27  Sam Weinig  <sam@webkit.org>
 

trunk/LayoutTests/platform/wk2/TestExpectations

@@ -252 +252 @@
 fast/block/lineboxcontain/font.html
 
-# WTR needs an implementation of setAutomaticLinkDetectionEnabled.
-# https://bugs.webkit.org/show_bug.cgi?id=87162
-editing/inserting/smart-link-when-caret-is-moved-before-URL.html
+# Strange error in “Internals”
 editing/inserting/smart-quote-with-all-configurations.html
-editing/inserting/typing-space-to-trigger-smart-link.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=115203

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-08-27  Jonathan Bedard  <jbedard@apple.com>
+
+        WTR needs an implementation of setAutomaticLinkDetectionEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=87162
+
+        Reviewed by Darin Adler
+
+        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+        (WKBundleSetAutomaticLinkDetectionEnabled): Added WKBundleSetAutomaticLinkDetectionEnabled definition.
+        * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: Added WKBundleSetAutomaticLinkDetectionEnabled declaration.
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::setAutomaticLinkDetectionEnabled): Added setAutomaticLinkDetectionEnabled definition.
+        * WebProcess/InjectedBundle/InjectedBundle.h: Added setAutomaticLinkDetectionEnabled declaration.
+        * WebProcess/WebProcess.h: Declared setTextCheckerState public.
+
 2016-08-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp

@@ -156 +156 @@
 }
 
+void WKBundleSetAutomaticLinkDetectionEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
+{
+    toImpl(bundleRef)->setAutomaticLinkDetectionEnabled(toImpl(pageGroupRef), enabled);
+}
+
 void WKBundleSetPrivateBrowsingEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
 {

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h

@@ -50 +50 @@
 WK_EXPORT void WKBundleSetPluginsEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
 WK_EXPORT void WKBundleSetJavaScriptCanAccessClipboard(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
+WK_EXPORT void WKBundleSetAutomaticLinkDetectionEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled);
 WK_EXPORT void WKBundleSetPrivateBrowsingEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
 WK_EXPORT void WKBundleSetPopupBlockingEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -32 +32 @@
 #include "NotificationPermissionRequestManager.h"
 #include "SessionTracker.h"
+#include "TextChecker.h"
 #include "UserData.h"
 #include "WKAPICast.h"
@@ -46 +47 @@
 #include "WebProcess.h"
 #include "WebProcessCreationParameters.h"
+#include "WebProcessMessages.h"
 #include "WebProcessPoolMessages.h"
 #include "WebUserContentController.h"
@@ -303 +305 @@
 }
 
+void InjectedBundle::setAutomaticLinkDetectionEnabled(WebPageGroupProxy* pageGroup, bool enabled)
+{
+#if USE(APPKIT)
+    if (enabled == TextChecker::state().isAutomaticLinkDetectionEnabled)
+        return;
+    TextChecker::setAutomaticLinkDetectionEnabled(enabled);
+    WebProcess::singleton().setTextCheckerState(TextChecker::state());
+#endif
+}
+
 void InjectedBundle::setPrivateBrowsingEnabled(WebPageGroupProxy* pageGroup, bool enabled)
 {

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h

@@ -107 +107 @@
     void setPluginsEnabled(WebPageGroupProxy*, bool);
     void setJavaScriptCanAccessClipboard(WebPageGroupProxy*, bool);
+    void setAutomaticLinkDetectionEnabled(WebPageGroupProxy*, bool enabled);
     void setPrivateBrowsingEnabled(WebPageGroupProxy*, bool);
     void setPopupBlockingEnabled(WebPageGroupProxy*, bool);

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -150 +150 @@
     
     const TextCheckerState& textCheckerState() const { return m_textCheckerState; }
+    void setTextCheckerState(const TextCheckerState&);
 
     void clearResourceCaches(ResourceCachesToClear = AllResourceCaches);
@@ -267 +268 @@
     void startMemorySampler(const SandboxExtension::Handle&, const String&, const double);
     void stopMemorySampler();
-
-    void setTextCheckerState(const TextCheckerState&);
     
     void getWebCoreStatistics(uint64_t callbackID);

trunk/Tools/ChangeLog

@@ +1 @@
+2016-08-27  Jonathan Bedard  <jbedard@apple.com>
+
+        WTR needs an implementation of setAutomaticLinkDetectionEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=87162
+
+        Reviewed by Darin Adler.
+
+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl: Added setAutomaticLinkDetectionEnabled binding.
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::beginTesting): Set automatic link detection to false by default.
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::setAutomaticLinkDetectionEnabled): Added setAutomaticLinkDetectionEnabled definition.
+        * WebKitTestRunner/InjectedBundle/TestRunner.h: Added setAutomaticLinkDetectionEnabled declaration.
+
 2016-08-27  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

@@ -63 +63 @@
     void setPluginsEnabled(boolean value);
     void setJavaScriptCanAccessClipboard(boolean value);
+    void setAutomaticLinkDetectionEnabled(boolean value);
     void setPrivateBrowsingEnabled(boolean value);
     void setPopupBlockingEnabled(boolean value);

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

@@ -295 +295 @@
     WKBundleSetAllowUniversalAccessFromFileURLs(m_bundle, m_pageGroup, true);
     WKBundleSetJavaScriptCanAccessClipboard(m_bundle, m_pageGroup, true);
+    WKBundleSetAutomaticLinkDetectionEnabled(m_bundle, m_pageGroup, false);
     WKBundleSetPrivateBrowsingEnabled(m_bundle, m_pageGroup, false);
     WKBundleSetAuthorAndUserStylesEnabled(m_bundle, m_pageGroup, true);

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

@@ -406 +406 @@
 }
 
+void TestRunner::setAutomaticLinkDetectionEnabled(bool enabled)
+{
+    auto& injectedBundle = InjectedBundle::singleton();
+    WKBundleSetAutomaticLinkDetectionEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
+}
+
 void TestRunner::setPrivateBrowsingEnabled(bool enabled)
 {

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

@@ -110 +110 @@
     void setPluginsEnabled(bool);
     void setJavaScriptCanAccessClipboard(bool);
+    void setAutomaticLinkDetectionEnabled(bool);
     void setPrivateBrowsingEnabled(bool);
     void setPopupBlockingEnabled(bool);