diff options
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/EventHandler.cpp | 6 | ||||
| -rw-r--r-- | WebCore/page/EventHandler.h | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp index d68dccf..8a008dc 100644 --- a/WebCore/page/EventHandler.cpp +++ b/WebCore/page/EventHandler.cpp @@ -81,13 +81,10 @@ #include "TouchEvent.h" #endif -<<<<<<< HEAD #if defined(ANDROID_PLUGINS) #include "WebViewCore.h" #endif -======= ->>>>>>> webkit.org at r54127 namespace WebCore { using namespace HTMLNames; @@ -2609,7 +2606,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) m_firstTouchPagePos = pagePoint; } -<<<<<<< HEAD // ANDROID // The touch event should act on m_touchEventTarget, not target // TODO: Upstream this fix to webkit.org @@ -2617,8 +2613,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) point.screenPos().x(), point.screenPos().y(), adjustedPageX, adjustedPageY); -======= ->>>>>>> webkit.org at r54127 if (point.state() == PlatformTouchPoint::TouchReleased) releasedTouches->append(touch); else if (point.state() == PlatformTouchPoint::TouchCancelled) diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h index 83f2de8..f267ef5 100644 --- a/WebCore/page/EventHandler.h +++ b/WebCore/page/EventHandler.h @@ -425,10 +425,6 @@ private: IntPoint m_firstTouchScreenPos; IntPoint m_firstTouchPagePos; #endif -<<<<<<< HEAD - -======= ->>>>>>> webkit.org at r54127 }; } // namespace WebCore |