[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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127494 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent bf435db0
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> 2012-09-03 Tao Bai <michaelbai@chromium.org>
Added ANDROID_GDBSERVER definition for Ant Added ANDROID_GDBSERVER definition for Ant
......
...@@ -288,7 +288,7 @@ public: ...@@ -288,7 +288,7 @@ public:
virtual void didUpdateLayout() { } virtual void didUpdateLayout() { }
// Return true to swallow the input event if the embedder will start a disambiguation popup // 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 ----------------------------------------------------- // Session history -----------------------------------------------------
......
...@@ -718,7 +718,7 @@ bool WebViewImpl::handleGestureEvent(const WebGestureEvent& event) ...@@ -718,7 +718,7 @@ bool WebViewImpl::handleGestureEvent(const WebGestureEvent& event)
findGoodTouchTargets(event.boundingBox, mainFrameImpl()->frame(), pageScaleFactor(), goodTargets); findGoodTouchTargets(event.boundingBox, mainFrameImpl()->frame(), pageScaleFactor(), goodTargets);
// FIXME: replace touch adjustment code when numberOfGoodTargets == 1? // FIXME: replace touch adjustment code when numberOfGoodTargets == 1?
// Single candidate case is currently handled by: https://bugs.webkit.org/show_bug.cgi?id=85101 // 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; return true;
} }
......
...@@ -1080,7 +1080,7 @@ TEST_F(WebFrameTest, SelectRange) ...@@ -1080,7 +1080,7 @@ TEST_F(WebFrameTest, SelectRange)
class DisambiguationPopupTestWebViewClient : public WebViewClient { class DisambiguationPopupTestWebViewClient : public WebViewClient {
public: 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); EXPECT_GE(targetRects.size(), 2u);
m_triggered = true; m_triggered = true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment