Changeset 127095 in webkit

Timestamp:

Aug 29, 2012 9:08:37 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Implement disambiguation popup (a.k.a. Link Preview)
​https://bugs.webkit.org/show_bug.cgi?id=94182

Patch by Tien-Ren Chen <​trchen@chromium.org> on 2012-08-29
Reviewed by Adam Barth.

In this new implementation, we add a new WebViewClient::handleDisambiguationPopup delegate.
The disambiguation sequence will be initiated by the gesture event handler
in WebViewImpl if an ambiguous tap is detected, then
m_client->handleDisambiguationPopup will be called, so the embedder can
decide whether to swallow the touch event and show a popup.

New test: WebFrameTest.DisambiguationPopupTest

• WebKit.gyp:
• features.gypi:
• public/WebInputEvent.h:

(WebGestureEvent):
(WebKit::WebGestureEvent::WebGestureEvent):

• public/WebTouchCandidatesInfo.h: Removed.
• public/WebView.h:

(WebKit):

• public/WebViewClient.h:

(WebKit):
(WebViewClient):
(WebKit::WebViewClient::triggersLinkPreview):

• src/WebInputEvent.cpp:

(SameSizeAsWebGestureEvent):

• src/WebViewImpl.cpp:

(WebKit):
(WebKit::WebViewImpl::handleGestureEventWithLinkPreview):
(WebKit::WebViewImpl::handleGestureEvent):

• src/WebViewImpl.h:

(WebViewImpl):

Location:

trunk/Source

Files:

• WebCore/WebCore.gypi (modified) (1 diff)
• WebCore/page/TouchDisambiguation.cpp (added)
• WebCore/page/TouchDisambiguation.h (added)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebViewClient.h (modified) (3 diffs)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (3 diffs)
• WebKit/chromium/tests/WebFrameTest.cpp (modified) (1 diff)
• WebKit/chromium/tests/data/disambiguation_popup.html (added)

trunk/Source/WebCore/WebCore.gypi

@@ -3164 +3164 @@
             'page/TouchAdjustment.cpp',
             'page/TouchAdjustment.h',
+            'page/TouchDisambiguation.cpp',
+            'page/TouchDisambiguation.h',
             'page/UserContentURLPattern.cpp',
             'page/WebKitAnimation.cpp',

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-08-29  Tien-Ren Chen  <trchen@chromium.org>
+
+        [chromium] Implement disambiguation popup (a.k.a. Link Preview)
+        https://bugs.webkit.org/show_bug.cgi?id=94182
+
+        Reviewed by Adam Barth.
+
+        In this new implementation, we add a new WebViewClient::handleDisambiguationPopup delegate.
+        The disambiguation sequence will be initiated by the gesture event handler
+        in WebViewImpl if an ambiguous tap is detected, then
+        m_client->handleDisambiguationPopup will be called, so the embedder can
+        decide whether to swallow the touch event and show a popup.
+
+        New test: WebFrameTest.DisambiguationPopupTest
+
+        * WebKit.gyp:
+        * features.gypi:
+        * public/WebInputEvent.h:
+        (WebGestureEvent):
+        (WebKit::WebGestureEvent::WebGestureEvent):
+        * public/WebTouchCandidatesInfo.h: Removed.
+        * public/WebView.h:
+        (WebKit):
+        * public/WebViewClient.h:
+        (WebKit):
+        (WebViewClient):
+        (WebKit::WebViewClient::triggersLinkPreview):
+        * src/WebInputEvent.cpp:
+        (SameSizeAsWebGestureEvent):
+        * src/WebViewImpl.cpp:
+        (WebKit):
+        (WebKit::WebViewImpl::handleGestureEventWithLinkPreview):
+        (WebKit::WebViewImpl::handleGestureEvent):
+        * src/WebViewImpl.h:
+        (WebViewImpl):
+
 2012-08-29  Dominic Mazzoni  <dmazzoni@google.com>
 

trunk/Source/WebKit/chromium/public/WebViewClient.h

@@ -63 +63 @@
 class WebGeolocationClient;
 class WebGeolocationService;
+class WebGestureEvent;
 class WebHelperPlugin;
 class WebHitTestResult;
@@ -72 +73 @@
 class WebNotificationPresenter;
 class WebRange;
+class WebRect;
 class WebSpeechInputController;
 class WebSpeechInputListener;
@@ -286 +288 @@
     virtual void didUpdateLayout() { }
 
+    // Return true to swallow the input event if the embedder will start a disambiguation popup
+    virtual bool handleDisambiguationPopup(const WebGestureEvent&, const WebVector<WebRect>& targetRects) { return false; }
+
     // Session history -----------------------------------------------------
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -170 +170 @@
 #if ENABLE(GESTURE_EVENTS)
 #include "PlatformGestureEvent.h"
+#include "TouchDisambiguation.h"
 #endif
 
@@ -708 +709 @@
             return true;
 
-        PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
         RefPtr<WebCore::PopupContainer> selectPopup;
         selectPopup = m_selectPopup;
         hideSelectPopup();
         ASSERT(!m_selectPopup);
+
+        if (!event.boundingBox.isEmpty()) {
+            Vector<IntRect> goodTargets;
+            findGoodTouchTargets(event.boundingBox, mainFrameImpl()->frame(), pageScaleFactor(), goodTargets);
+            // FIXME: replace touch adjustment code when numberOfGoodTargets == 1?
+            // Single candidate case is currently handled by: https://bugs.webkit.org/show_bug.cgi?id=85101
+            if (goodTargets.size() >= 2 && m_client && m_client->handleDisambiguationPopup(event, goodTargets))
+                return true;
+        }
+
+        PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
         bool gestureHandled = mainFrameImpl()->frame()->eventHandler()->handleGestureEvent(platformEvent);
+
         if (m_selectPopup && m_selectPopup == selectPopup) {
             // That tap triggered a select popup which is the same as the one that
@@ -721 +733 @@
             hideSelectPopup();
         }
+
         return gestureHandled;
     }

trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp

@@ -1079 +1079 @@
 }
 
+class DisambiguationPopupTestWebViewClient : public WebViewClient {
+public:
+    virtual bool handleDisambiguationPopup(const WebGestureEvent&, const WebVector<WebRect>& targetRects) OVERRIDE
+    {
+        EXPECT_GE(targetRects.size(), 2u);
+        m_triggered = true;
+        return true;
+    }
+
+    bool triggered() const { return m_triggered; }
+    void resetTriggered() { m_triggered = false; }
+    bool m_triggered;
+};
+
+static WebGestureEvent fatTap(int x, int y)
+{
+    WebGestureEvent event;
+    event.type = WebInputEvent::GestureTap;
+    event.x = x;
+    event.y = y;
+    event.boundingBox = WebCore::IntRect(x - 25, y - 25, 50, 50);
+    return event;
+}
+
+TEST_F(WebFrameTest, DisambiguationPopupTest)
+{
+    registerMockedHttpURLLoad("disambiguation_popup.html");
+
+    DisambiguationPopupTestWebViewClient client;
+
+    // Make sure we initialize to minimum scale, even if the window size
+    // only becomes available after the load begins.
+    WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup.html", true, 0, &client));
+    webViewImpl->resize(WebSize(1000, 1000));
+    webViewImpl->layout();
+
+    client.resetTriggered();
+    webViewImpl->handleInputEvent(fatTap(0, 0));
+    EXPECT_FALSE(client.triggered());
+
+    client.resetTriggered();
+    webViewImpl->handleInputEvent(fatTap(200, 115));
+    EXPECT_FALSE(client.triggered());
+
+    for (int i = 0; i <= 46; i++) {
+        client.resetTriggered();
+        webViewImpl->handleInputEvent(fatTap(120, 230 + i * 5));
+
+        int j = i % 10;
+        if (j >= 7 && j <= 9)
+            EXPECT_TRUE(client.triggered());
+        else
+            EXPECT_FALSE(client.triggered());
+    }
+
+    for (int i = 0; i <= 46; i++) {
+        client.resetTriggered();
+        webViewImpl->handleInputEvent(fatTap(10 + i * 5, 590));
+
+        int j = i % 10;
+        if (j >= 7 && j <= 9)
+            EXPECT_TRUE(client.triggered());
+        else
+            EXPECT_FALSE(client.triggered());
+    }
+
+}
+
 } // namespace