Changeset 55843 in webkit

Timestamp:

Mar 11, 2010 7:25:15 AM (14 years ago)

Author:

benm@google.com

Message:

[Android] The platform touch events on Android are missing support
for key modifiers.
​https://bugs.webkit.org/show_bug.cgi?id=35521

Reviewed by Jeremy Orlow.

Add support in PlatformToucHEventAndroid for the platform supplying
key modifiers with touch events.

Fixes Android so it now passes basic-single-touch-events.html.

• page/EventHandler.cpp:

(WebCore::EventHandler::handleTouchEvent): Fix two compiler warnings.

• platform/PlatformTouchEvent.h:

(WebCore::PlatformTouchEvent::PlatformTouchEvent): Add support for

key modifiers on Android.

• platform/android/PlatformTouchEventAndroid.cpp:

(WebCore::PlatformTouchEvent::PlatformTouchEvent): ditto.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (3 diffs)
• platform/PlatformTouchEvent.h (modified) (1 diff)
• platform/android/PlatformTouchEventAndroid.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-10  Ben Murdoch  <benm@google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        [Android] The platform touch events on Android are missing support
+        for key modifiers.
+        https://bugs.webkit.org/show_bug.cgi?id=35521
+
+        Add support in PlatformToucHEventAndroid for the platform supplying
+        key modifiers with touch events.
+
+        Fixes Android so it now passes basic-single-touch-events.html.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleTouchEvent): Fix two compiler warnings.
+        * platform/PlatformTouchEvent.h:
+        (WebCore::PlatformTouchEvent::PlatformTouchEvent): Add support for
+            key modifiers on Android.
+        * platform/android/PlatformTouchEventAndroid.cpp:
+        (WebCore::PlatformTouchEvent::PlatformTouchEvent): ditto.
+
 2010-03-10  Steve Block  <steveblock@google.com>
 

trunk/WebCore/page/EventHandler.cpp

@@ -2611 +2611 @@
     RefPtr<TouchList> targetTouches = TouchList::create();
 
-    for (int i = 0; i < touches->length(); ++i) {
+    for (unsigned i = 0; i < touches->length(); ++i) {
         if (touches->item(i)->target()->toNode()->isSameNode(touchTarget->target()->toNode()))
             targetTouches->append(touches->item(i));
@@ -2630 +2630 @@
     AtomicString* eventName = 0;
 
-    for (int i = 0; i < points.size(); ++i) {
+    for (unsigned i = 0; i < points.size(); ++i) {
         const PlatformTouchPoint& point = points[i];
         IntPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos());
@@ -2710 +2710 @@
                                                    0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(),
                                                    event.metaKey());
-
         ExceptionCode ec = 0;
         touchEventTarget->dispatchEvent(cancelEv.get(), ec);

trunk/WebCore/platform/PlatformTouchEvent.h

@@ -57 +57 @@
     PlatformTouchEvent(QTouchEvent*);
 #elif PLATFORM(ANDROID)
-    PlatformTouchEvent(const IntPoint& windowPos, TouchEventType, PlatformTouchPoint::State);
+    PlatformTouchEvent(const IntPoint& windowPos, TouchEventType, PlatformTouchPoint::State, int metaState);
 #endif
 

trunk/WebCore/platform/android/PlatformTouchEventAndroid.cpp

@@ -31 +31 @@
 namespace WebCore {
 
-PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state)
+// These values should be kept in sync with those defined in the android.view.KeyEvent class from the Android SDK.
+enum AndroidMetaKeyState {
+    META_SHIFT_ON = 0x01,
+    META_ALT_ON = 0x02,
+    META_SYM_ON = 0x04
+};
+
+PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state, int metaState)
     : m_type(type)
-    , m_ctrlKey(false)
-    , m_altKey(false)
-    , m_shiftKey(false)
     , m_metaKey(false)
 {
     m_touchPoints.append(PlatformTouchPoint(windowPos, state));
+
+    m_altKey = metaState & META_ALT_ON;
+    m_shiftKey = metaState & META_SHIFT_ON;
+    m_ctrlKey = metaState & META_SYM_ON;
 }