Changeset 127494 in webkit

Timestamp:

Sep 4, 2012 1:25:47 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Rename WebViewClient::handleDisambiguationPopup
​https://bugs.webkit.org/show_bug.cgi?id=95529

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

Rename it to something more descriptive (WebViewClient::didTapMultipleTargets) before people start using it.

• public/WebViewClient.h:

(WebKit::WebViewClient::didTapMultipleTargets):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::handleGestureEvent):

• tests/WebFrameTest.cpp:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebViewClient.h (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (1 diff)
• tests/WebFrameTest.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-04  Tien-Ren Chen  <trchen@chromium.org>
+
+        [chromium] Rename WebViewClient::handleDisambiguationPopup
+        https://bugs.webkit.org/show_bug.cgi?id=95529
+
+        Reviewed by Adam Barth.
+
+        Rename it to something more descriptive (WebViewClient::didTapMultipleTargets) before people start using it.
+
+        * public/WebViewClient.h:
+        (WebKit::WebViewClient::didTapMultipleTargets):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::handleGestureEvent):
+        * tests/WebFrameTest.cpp:
+
 2012-09-03  Tao Bai  <michaelbai@chromium.org>
 

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

@@ -289 +289 @@
 
     // 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; }
+    virtual bool didTapMultipleTargets(const WebGestureEvent&, const WebVector<WebRect>& targetRects) { return false; }
 
     // Session history -----------------------------------------------------

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

@@ -719 +719 @@
             // 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))
+            if (goodTargets.size() >= 2 && m_client && m_client->didTapMultipleTargets(event, goodTargets))
                 return true;
         }

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

@@ -1081 +1081 @@
 class DisambiguationPopupTestWebViewClient : public WebViewClient {
 public:
-    virtual bool handleDisambiguationPopup(const WebGestureEvent&, const WebVector<WebRect>& targetRects) OVERRIDE
+    virtual bool didTapMultipleTargets(const WebGestureEvent&, const WebVector<WebRect>& targetRects) OVERRIDE
     {
         EXPECT_GE(targetRects.size(), 2u);