Title: [127494] trunk/Source/WebKit/chromium
- Revision
- 127494
- Author
- [email protected]
- Date
- 2012-09-04 13:25:47 -0700 (Tue, 04 Sep 2012)
Log Message
[chromium] Rename WebViewClient::handleDisambiguationPopup
https://bugs.webkit.org/show_bug.cgi?id=95529
Patch by Tien-Ren Chen <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (127493 => 127494)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-04 20:22:16 UTC (rev 127493)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-04 20:25:47 UTC (rev 127494)
@@ -1,3 +1,18 @@
+2012-09-04 Tien-Ren Chen <[email protected]>
+
+ [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 <[email protected]>
Added ANDROID_GDBSERVER definition for Ant
Modified: trunk/Source/WebKit/chromium/public/WebViewClient.h (127493 => 127494)
--- trunk/Source/WebKit/chromium/public/WebViewClient.h 2012-09-04 20:22:16 UTC (rev 127493)
+++ trunk/Source/WebKit/chromium/public/WebViewClient.h 2012-09-04 20:25:47 UTC (rev 127494)
@@ -288,7 +288,7 @@
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; }
+ virtual bool didTapMultipleTargets(const WebGestureEvent&, const WebVector<WebRect>& targetRects) { return false; }
// Session history -----------------------------------------------------
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (127493 => 127494)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-09-04 20:22:16 UTC (rev 127493)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-09-04 20:25:47 UTC (rev 127494)
@@ -718,7 +718,7 @@
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))
+ if (goodTargets.size() >= 2 && m_client && m_client->didTapMultipleTargets(event, goodTargets))
return true;
}
Modified: trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp (127493 => 127494)
--- trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2012-09-04 20:22:16 UTC (rev 127493)
+++ trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2012-09-04 20:25:47 UTC (rev 127494)
@@ -1080,7 +1080,7 @@
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);
m_triggered = true;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
