diff options
| author | Ben Murdoch <benm@google.com> | 2010-01-21 09:51:37 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-21 09:51:37 -0800 |
| commit | 0926ef1b86138ebea85100fdd825f89726482972 (patch) | |
| tree | a382b5c7733cdbef09a7f9f90286a5c49dba3894 | |
| parent | d418823c37b132353293917955d64f8ab2f59235 (diff) | |
| parent | 8378bbaf6c884178ee0d9ca200c1257b0c393843 (diff) | |
| download | external_webkit-0926ef1b86138ebea85100fdd825f89726482972.zip external_webkit-0926ef1b86138ebea85100fdd825f89726482972.tar.gz external_webkit-0926ef1b86138ebea85100fdd825f89726482972.tar.bz2 | |
Merge "Refactor style of Android specific touch events code in preparation for upstreaming to webkit.org."
| -rw-r--r-- | WebCore/platform/PlatformTouchEvent.h | 2 | ||||
| -rw-r--r-- | WebCore/platform/PlatformTouchPoint.h | 2 | ||||
| -rw-r--r-- | WebCore/platform/android/PlatformTouchEventAndroid.cpp | 10 | ||||
| -rw-r--r-- | WebCore/platform/android/PlatformTouchPointAndroid.cpp | 6 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 2 |
5 files changed, 16 insertions, 6 deletions
diff --git a/WebCore/platform/PlatformTouchEvent.h b/WebCore/platform/PlatformTouchEvent.h index 78de894..5371a40 100644 --- a/WebCore/platform/PlatformTouchEvent.h +++ b/WebCore/platform/PlatformTouchEvent.h @@ -60,7 +60,7 @@ public: #if PLATFORM(QT) PlatformTouchEvent(QTouchEvent*); #elif PLATFORM(ANDROID) - PlatformTouchEvent(const IntPoint&, const IntPoint&, TouchEventType, PlatformTouchPoint::State); + PlatformTouchEvent(const IntPoint& absolutePagePos, TouchEventType, PlatformTouchPoint::State); #endif TouchEventType type() const { return m_type; } diff --git a/WebCore/platform/PlatformTouchPoint.h b/WebCore/platform/PlatformTouchPoint.h index 339fe73..53bd8ae 100644 --- a/WebCore/platform/PlatformTouchPoint.h +++ b/WebCore/platform/PlatformTouchPoint.h @@ -47,7 +47,7 @@ public: #if PLATFORM(QT) PlatformTouchPoint(const QTouchEvent::TouchPoint&); #elif PLATFORM(ANDROID) - PlatformTouchPoint(const IntPoint&, const IntPoint&, State); + PlatformTouchPoint(const IntPoint& absolutePagePos, State); #endif int id() const { return m_id; } 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) { } } diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 224be5c..5ebc8eb 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1967,7 +1967,7 @@ int WebViewCore::handleTouchEvent(int action, int x, int y) m_lastTouchPoint = pt; - WebCore::PlatformTouchEvent te(pt, pt, type, touchState); + WebCore::PlatformTouchEvent te(pt, type, touchState); preventDefault = m_mainFrame->eventHandler()->handleTouchEvent(te); #endif |