diff options
Diffstat (limited to 'WebCore/dom/TouchEvent.h')
| -rw-r--r-- | WebCore/dom/TouchEvent.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebCore/dom/TouchEvent.h b/WebCore/dom/TouchEvent.h index abc1ee2..263dc36 100644 --- a/WebCore/dom/TouchEvent.h +++ b/WebCore/dom/TouchEvent.h @@ -60,6 +60,7 @@ public: TouchList* targetTouches() const { return m_targetTouches.get(); } TouchList* changedTouches() const { return m_changedTouches.get(); } +<<<<<<< HEAD #if PLATFORM(ANDROID) bool longPressPrevented() const { return m_longPressPrevented; } void preventLongPress() { m_longPressPrevented = true; } @@ -70,6 +71,8 @@ public: void setDoubleTapPrevented(bool prevented) { m_doubleTapPrevented = prevented; } #endif +======= +>>>>>>> webkit.org at r54127 private: TouchEvent() {} TouchEvent(TouchList* touches, TouchList* targetTouches, @@ -83,11 +86,14 @@ private: RefPtr<TouchList> m_touches; RefPtr<TouchList> m_targetTouches; RefPtr<TouchList> m_changedTouches; +<<<<<<< HEAD #if PLATFORM(ANDROID) bool m_longPressPrevented; bool m_doubleTapPrevented; #endif +======= +>>>>>>> webkit.org at r54127 }; } // namespace WebCore |