Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 7 insertions, 5 deletions

diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h
index 74acdb77e..b64f6fee6 100644
--- a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h
+++ b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h
@@ -46,7 +46,7 @@ class IntRect;
 namespace WebKit {
 
 class NativeWebTouchEvent;
-class QtViewportInteractionEngine;
+class QtViewportHandler;
 class ShareableBitmap;
 class WebGestureEvent;
 class WebPageProxy;
@@ -75,9 +75,10 @@ public:
     void handleInputMethodEvent(QInputMethodEvent*);
     void handleTouchEvent(QTouchEvent*);
 
-    void setViewportInteractionEngine(QtViewportInteractionEngine*);
+    void setViewportHandler(QtViewportHandler*);
 
-    void handlePotentialSingleTapEvent(const QTouchEvent::TouchPoint&);
+    void activateTapHighlight(const QTouchEvent::TouchPoint&);
+    void deactivateTapHighlight();
     void handleSingleTapEvent(const QTouchEvent::TouchPoint&);
     void handleDoubleTapEvent(const QTouchEvent::TouchPoint&);
 
@@ -89,13 +90,13 @@ public:
 #endif
     void resetGestureRecognizers();
 
-    QtViewportInteractionEngine* interactionEngine() { return m_interactionEngine; }
+    QtViewportHandler* viewportHandler() { return m_viewportHandler; }
 
     void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage);
 
 protected:
     WebPageProxy* m_webPageProxy;
-    QtViewportInteractionEngine* m_interactionEngine;
+    QtViewportHandler* m_viewportHandler;
     QtPanGestureRecognizer m_panGestureRecognizer;
     QtPinchGestureRecognizer m_pinchGestureRecognizer;
     QtTapGestureRecognizer m_tapGestureRecognizer;
@@ -113,6 +114,7 @@ private:
     Qt::MouseButton m_previousClickButton;
     int m_clickCount;
     bool m_postponeTextInputStateChanged;
+    bool m_isTapHighlightActive;
 };
 
 } // namespace WebKit