diff options
| author | Huahui Wu <hwu@google.com> | 2010-10-04 15:23:22 -0700 |
|---|---|---|
| committer | Huahui Wu <hwu@google.com> | 2010-10-04 15:23:22 -0700 |
| commit | bd2883826a01ef33a513566c75923d6ddec710ad (patch) | |
| tree | 66fea8dd1a8e3a1ace3050edeeeec74e8dca9108 /WebCore | |
| parent | 5abcebdcce80658b012cd1de400558035899457c (diff) | |
| download | external_webkit-bd2883826a01ef33a513566c75923d6ddec710ad.zip external_webkit-bd2883826a01ef33a513566c75923d6ddec710ad.tar.gz external_webkit-bd2883826a01ef33a513566c75923d6ddec710ad.tar.bz2 | |
b/3039749 resolving the conflicts for WebKit.
Change-Id: If67e444a050d2a96e7d076c4faee8a160e08d4d5
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/PlatformTouchEvent.h | 1 | ||||
| -rw-r--r-- | WebCore/platform/PlatformTouchPoint.h | 1 | ||||
| -rw-r--r-- | WebCore/platform/android/PlatformTouchEventAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/android/PlatformTouchPointAndroid.cpp | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/WebCore/platform/PlatformTouchEvent.h b/WebCore/platform/PlatformTouchEvent.h index db0f552..19cb8e9 100644 --- a/WebCore/platform/PlatformTouchEvent.h +++ b/WebCore/platform/PlatformTouchEvent.h @@ -60,7 +60,6 @@ public: #if PLATFORM(QT) PlatformTouchEvent(QTouchEvent*); #elif PLATFORM(ANDROID) - // Change in following line is in ANDROID but waiting for patch to WebKit getting accepted. PlatformTouchEvent(const Vector<IntPoint>&, TouchEventType, PlatformTouchPoint::State, int metaState); #endif diff --git a/WebCore/platform/PlatformTouchPoint.h b/WebCore/platform/PlatformTouchPoint.h index ffde863..4b8ebae 100644 --- a/WebCore/platform/PlatformTouchPoint.h +++ b/WebCore/platform/PlatformTouchPoint.h @@ -47,7 +47,6 @@ public: PlatformTouchPoint(const QTouchEvent::TouchPoint&); PlatformTouchPoint() {}; #elif PLATFORM(ANDROID) - // Change in following line is in ANDROID but waiting for patch to WebKit getting accepted. PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State); #endif diff --git a/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/WebCore/platform/android/PlatformTouchEventAndroid.cpp index 50fc203..8b3d285 100644 --- a/WebCore/platform/android/PlatformTouchEventAndroid.cpp +++ b/WebCore/platform/android/PlatformTouchEventAndroid.cpp @@ -37,12 +37,10 @@ enum AndroidMetaKeyState { META_SYM_ON = 0x04 }; -// Changes in following two lines are in ANDROID but waiting for patch to WebKit getting accepted. PlatformTouchEvent::PlatformTouchEvent(const Vector<IntPoint>& windowPoints, TouchEventType type, PlatformTouchPoint::State state, int metaState) : m_type(type) , m_metaKey(false) { - // Changes in following three lines are in ANDROID but waiting for patch to WebKit getting accepted. m_touchPoints.reserveCapacity(windowPoints.size()); for (unsigned c = 0; c < windowPoints.size(); c++) m_touchPoints.append(PlatformTouchPoint(c, windowPoints[c], state)); diff --git a/WebCore/platform/android/PlatformTouchPointAndroid.cpp b/WebCore/platform/android/PlatformTouchPointAndroid.cpp index 5a181cc..777410a 100644 --- a/WebCore/platform/android/PlatformTouchPointAndroid.cpp +++ b/WebCore/platform/android/PlatformTouchPointAndroid.cpp @@ -30,7 +30,6 @@ namespace WebCore { -// Changes in following two lines are in ANDROID but waiting for patch to WebKit getting accepted. PlatformTouchPoint::PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State state) : m_id(id) , m_state(state) |