diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
| commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
| tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/page/EventHandler.h | |
| parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
| download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 | |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/page/EventHandler.h')
| -rw-r--r-- | WebCore/page/EventHandler.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h index 8ccd761..ead384c 100644 --- a/WebCore/page/EventHandler.h +++ b/WebCore/page/EventHandler.h @@ -98,6 +98,7 @@ public: Node* mousePressNode() const; void setMousePressNode(PassRefPtr<Node>); + void startPanScrolling(RenderObject*); bool panScrollInProgress() { return m_panScrollInProgress; } void setPanScrollInProgress(bool inProgress) { m_panScrollInProgress = inProgress; } @@ -205,12 +206,17 @@ public: #endif #if ENABLE(TOUCH_EVENTS) +<<<<<<< HEAD #if PLATFORM(ANDROID) int handleTouchEvent(const PlatformTouchEvent&); #else bool handleTouchEvent(const PlatformTouchEvent&); #endif #endif +======= + bool handleTouchEvent(const PlatformTouchEvent&); +#endif +>>>>>>> webkit.org at r54127 private: #if ENABLE(DRAG_SUPPORT) @@ -424,7 +430,10 @@ private: IntPoint m_firstTouchScreenPos; IntPoint m_firstTouchPagePos; #endif +<<<<<<< HEAD +======= +>>>>>>> webkit.org at r54127 }; } // namespace WebCore |