diff options
Diffstat (limited to 'WebCore')
| -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 |
4 files changed, 15 insertions, 5 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) { } } |
