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/platform/android/PlatformTouchPointAndroid.cpp | |
| 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/platform/android/PlatformTouchPointAndroid.cpp')
| -rw-r--r-- | WebCore/platform/android/PlatformTouchPointAndroid.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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) |