Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Unified Diff: Source/WebKit/chromium/src/WebViewImpl.h

Issue 15663005: Expand tap highlight to allow multiple highlights for touch disambiguation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebKit/chromium/src/WebViewImpl.h
diff --git a/Source/WebKit/chromium/src/WebViewImpl.h b/Source/WebKit/chromium/src/WebViewImpl.h
index 2c8b37643916a43dd36d3f48b2f8c57dcc7858c8..a4ca869f0145b33c403c3de14636a5efb68ff291 100644
--- a/Source/WebKit/chromium/src/WebViewImpl.h
+++ b/Source/WebKit/chromium/src/WebViewImpl.h
@@ -539,7 +539,8 @@ public:
void computeScaleAndScrollForHitRect(const WebRect& hitRect, AutoZoomType, float& scale, WebPoint& scroll, bool& isAnchor);
WebCore::Node* bestTapNode(const WebCore::PlatformGestureEvent& tapEvent);
- void enableTapHighlight(const WebCore::PlatformGestureEvent& tapEvent);
+ void enableTapHighlightAtPoint(const WebCore::PlatformGestureEvent& tapEvent);
+ void enableTapHighlights(Vector<WebCore::Node*>&);
void computeScaleAndScrollForFocusedNode(WebCore::Node* focusedNode, float& scale, WebCore::IntPoint& scroll, bool& needAnimation);
void animateZoomAroundPoint(const WebCore::IntPoint&, AutoZoomType);
@@ -570,7 +571,7 @@ public:
bool shouldDisableDesktopWorkarounds();
// Exposed for tests.
- LinkHighlight* linkHighlight() { return m_linkHighlight.get(); }
+ LinkHighlight* linkHighlight(int i) { return m_linkHighlights[i].get(); }
WebSettingsImpl* settingsImpl();
@@ -832,7 +833,7 @@ private:
WebPoint m_globalPositionOnFlingStart;
int m_flingModifier;
bool m_flingSourceDevice;
- OwnPtr<LinkHighlight> m_linkHighlight;
+ Vector<OwnPtr<LinkHighlight> > m_linkHighlights;
OwnPtr<ValidationMessageClientImpl> m_validationMessage;
bool m_showFPSCounter;

Powered by Google App Engine
This is Rietveld 408576698