diff options
Diffstat (limited to 'WebCore/platform/android/PlatformTouchEventAndroid.cpp')
| -rw-r--r-- | WebCore/platform/android/PlatformTouchEventAndroid.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/WebCore/platform/android/PlatformTouchEventAndroid.cpp index eb23322..8b3d285 100644 --- a/WebCore/platform/android/PlatformTouchEventAndroid.cpp +++ b/WebCore/platform/android/PlatformTouchEventAndroid.cpp @@ -43,11 +43,7 @@ PlatformTouchEvent::PlatformTouchEvent(const Vector<IntPoint>& windowPoints, Tou { m_touchPoints.reserveCapacity(windowPoints.size()); for (unsigned c = 0; c < windowPoints.size(); c++) -<<<<<<< HEAD m_touchPoints.append(PlatformTouchPoint(c, windowPoints[c], state)); -======= - m_touchPoints.append(PlatformTouchPoint(windowPos, state)); ->>>>>>> webkit.org at r68651 m_altKey = metaState & META_ALT_ON; m_shiftKey = metaState & META_SHIFT_ON; |