commit 51b2906e11752df6c18351cf520e30522d3b53a1
author Torne (Richard Coles) <torne@google.com> Thu Nov 28 11:56:03 2013 +0000
committer Torne (Richard Coles) <torne@google.com> Thu Nov 28 11:56:03 2013 +0000
tree 3997e3ef1a24b5ce4c7e0d770d6b1fba080ab4fa
parent b7934c18a33e7f80239d89a6f402a3863b8e60cb

Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: Ia99affe6e2cf9342843aa38fa1d75355fd5c71f7

Source/core/page/EventHandler.h

diff --git a/Source/core/page/EventHandler.h b/Source/core/page/EventHandler.h
index 2fca448..f22e7fe 100644
--- a/Source/core/page/EventHandler.h
+++ b/Source/core/page/EventHandler.h
@@ -170,8 +170,7 @@
 
     void capsLockStateMayHaveChanged(); // Only called by FrameSelection
 
-    void sendResizeEvent(); // Only called in FrameView
-    void sendScrollEvent(); // Ditto
+    void sendScrollEvent(); // Only called in FrameView
 
     bool handleTouchEvent(const PlatformTouchEvent&);
 
@@ -200,9 +199,9 @@
     bool handlePasteGlobalSelection(const PlatformMouseEvent&);
 
     bool handleGestureTap(const PlatformGestureEvent&);
-    bool handleGestureLongPress(const PlatformGestureEvent&);
-    bool handleGestureLongTap(const PlatformGestureEvent&);
-    bool handleGestureTwoFingerTap(const PlatformGestureEvent&);
+    bool handleGestureLongPress(const PlatformGestureEvent&, const IntPoint& adjustedPoint);
+    bool handleGestureLongTap(const PlatformGestureEvent&, const IntPoint& adjustedPoint);
+    bool handleGestureTwoFingerTap(const PlatformGestureEvent&, const IntPoint& adjustedPoint);
     bool handleGestureScrollUpdate(const PlatformGestureEvent&);
     bool handleGestureScrollBegin(const PlatformGestureEvent&);
     void clearGestureScrollNodes();
@@ -303,7 +302,6 @@
 
     bool m_mouseDownMayStartSelect;
     bool m_mouseDownMayStartDrag;
-    bool m_dragMayStartSelectionInstead;
     bool m_mouseDownWasSingleClickInSelection;
     enum SelectionInitiationState { HaveNotStartedSelection, PlacedCaret, ExtendedSelection };
     SelectionInitiationState m_selectionInitiationState;