diff options
| author | Ben Murdoch <benm@google.com> | 2010-01-21 12:24:38 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-01-21 16:12:13 +0000 |
| commit | 8378bbaf6c884178ee0d9ca200c1257b0c393843 (patch) | |
| tree | f55d0e0916a3e01ff5f7df762d29cb8c9a06e90a /WebCore/platform/android | |
| parent | 1f8453220b6154c7e7749fe3342f489b295bee96 (diff) | |
| download | external_webkit-8378bbaf6c884178ee0d9ca200c1257b0c393843.zip external_webkit-8378bbaf6c884178ee0d9ca200c1257b0c393843.tar.gz external_webkit-8378bbaf6c884178ee0d9ca200c1257b0c393843.tar.bz2 | |
Refactor style of Android specific touch events code in preparation for upstreaming to webkit.org.
Change-Id: Id34e727145fe94e98e62a36b7fc8256468b4157c
Diffstat (limited to 'WebCore/platform/android')
| -rw-r--r-- | WebCore/platform/android/PlatformTouchEventAndroid.cpp | 10 | ||||
| -rw-r--r-- | WebCore/platform/android/PlatformTouchPointAndroid.cpp | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/WebCore/platform/android/PlatformTouchEventAndroid.cpp index 46d5c6f..e4af8a3 100644 --- a/WebCore/platform/android/PlatformTouchEventAndroid.cpp +++ b/WebCore/platform/android/PlatformTouchEventAndroid.cpp @@ -30,8 +30,14 @@ namespace WebCore { -PlatformTouchEvent::PlatformTouchEvent(const IntPoint& pos, const IntPoint& globalPos, TouchEventType type, PlatformTouchPoint::State state) : m_type(type) { - m_touchPoints.append(PlatformTouchPoint(pos, globalPos, state)); +PlatformTouchEvent::PlatformTouchEvent(const IntPoint& absolutePagePos, TouchEventType type, PlatformTouchPoint::State state) + : m_type(type) + , m_ctrlKey(false) + , m_altKey(false) + , m_shiftKey(false) + , m_metaKey(false) +{ + m_touchPoints.append(PlatformTouchPoint(absolutePagePos, state)); } } diff --git a/WebCore/platform/android/PlatformTouchPointAndroid.cpp b/WebCore/platform/android/PlatformTouchPointAndroid.cpp index cb22f5f..d790855 100644 --- a/WebCore/platform/android/PlatformTouchPointAndroid.cpp +++ b/WebCore/platform/android/PlatformTouchPointAndroid.cpp @@ -30,7 +30,11 @@ namespace WebCore { -PlatformTouchPoint::PlatformTouchPoint(const IntPoint& pos, const IntPoint& globalPos, State state) :m_id(0), m_state(state), m_screenPos(pos), m_pos(globalPos) {} +PlatformTouchPoint::PlatformTouchPoint(const IntPoint& absolutePagePos, State state) + : m_id(0) + , m_state(state) + , m_screenPos(absolutePagePos) + , m_pos(absolutePagePos) { } } |