diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:32:28 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:07:00 +0000 |
| commit | 8b17ffea299c44342b5479322adcb686277df548 (patch) | |
| tree | 15e53f60ae6227c7a9480fdb0933e1e385e9d4d7 /WebCore/page | |
| parent | 2b08bb37d88be143f20b58ad7608aff476ca8a96 (diff) | |
| download | external_webkit-8b17ffea299c44342b5479322adcb686277df548.zip external_webkit-8b17ffea299c44342b5479322adcb686277df548.tar.gz external_webkit-8b17ffea299c44342b5479322adcb686277df548.tar.bz2 | |
Merge webkit.org at r54127 : Fix final trivial merges
Change-Id: Ib24c66a3c609fd1c8ae9697f471a8abc85e5aa33
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 |