b/3039749 resolving the conflicts for WebKit.

Change-Id: If67e444a050d2a96e7d076c4faee8a160e08d4d5

diff --git a/WebCore/platform/PlatformTouchEvent.h b/WebCore/platform/PlatformTouchEvent.h
index db0f552..19cb8e9 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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)