diff options
Diffstat (limited to 'WebCore/page/EventHandler.h')
| -rw-r--r-- | WebCore/page/EventHandler.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h index 3348366..daf5a67 100644 --- a/WebCore/page/EventHandler.h +++ b/WebCore/page/EventHandler.h @@ -143,14 +143,11 @@ public: bool handleMouseReleaseEvent(const PlatformMouseEvent&); bool handleWheelEvent(PlatformWheelEvent&); -<<<<<<< HEAD:WebCore/page/EventHandler.h #if ENABLE(TOUCH_EVENTS) // Android bool handleTouchEvent(const PlatformTouchEvent&); #endif -======= #if ENABLE(CONTEXT_MENUS) ->>>>>>> webkit.org at 49305:WebCore/page/EventHandler.h bool sendContextMenuEvent(const PlatformMouseEvent&); #endif |