Changeset 79534 in webkit

Timestamp:

Feb 24, 2011 2:57:28 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-24 Robert Kroeger <​rjkroege@chromium.org>

Reviewed by Darin Fisher.

Added timestamps to PlatformTouchEvent etc.

PlatformTouchEvent doesn't have a timestamp and so
eventSender.leapForward cannot be used for touchevent based tests.
This change adds a timestamp to PlatformTouchEvent and initializes
it in a reasonable manner on Android and Qt platforms.

[chromium] [WebCore] [android] Touch events are missing time stamps
​https://bugs.webkit.org/show_bug.cgi?id=53510

• platform/PlatformTouchEvent.h: (WebCore::PlatformTouchEvent::PlatformTouchEvent): (WebCore::PlatformTouchEvent::timestamp):
• platform/android/PlatformTouchEventAndroid.cpp: (WebCore::PlatformTouchEvent::PlatformTouchEvent):
• platform/qt/PlatformTouchEventQt.cpp: (WebCore::PlatformTouchEvent::PlatformTouchEvent):

2011-02-24 Robert Kroeger <​rjkroege@chromium.org>

Reviewed by Darin Fisher.

Added timestamps to PlatformTouchEvent etc.

PlatformTouchEvent doesn't have a timestamp and so
eventSender.leapForward cannot be used for touchevent based tests.
This change constructs PlatformTouchEvents with timestamps
provided from a WebTouchEvent on chromium. It also adds an enum
to make code referring to specific WebTouchPoints easier to read.

[chromium] [WebCore] [android] Touch events are missing time stamps
​https://bugs.webkit.org/show_bug.cgi?id=53510

• public/WebTouchPoint.h: (WebKit::WebTouchPoint::WebTouchPoint):
• src/WebInputEventConversion.cpp: (WebKit::PlatformTouchEventBuilder::PlatformTouchEventBuilder):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/PlatformTouchEvent.h (modified) (3 diffs)
• WebCore/platform/android/PlatformTouchEventAndroid.cpp (modified) (2 diffs)
• WebCore/platform/qt/PlatformTouchEventQt.cpp (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebTouchPoint.h (modified) (1 diff)
• WebKit/chromium/src/WebInputEventConversion.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-24  Robert Kroeger  <rjkroege@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Added timestamps to PlatformTouchEvent etc.
+
+        PlatformTouchEvent doesn't have a timestamp and so
+        eventSender.leapForward cannot be used for touchevent based tests.
+        This change adds a timestamp to PlatformTouchEvent and initializes
+        it in a reasonable manner on Android and Qt platforms.
+
+        [chromium] [WebCore] [android] Touch events are missing time stamps
+        https://bugs.webkit.org/show_bug.cgi?id=53510
+
+        * platform/PlatformTouchEvent.h:
+        (WebCore::PlatformTouchEvent::PlatformTouchEvent):
+        (WebCore::PlatformTouchEvent::timestamp):
+        * platform/android/PlatformTouchEventAndroid.cpp:
+        (WebCore::PlatformTouchEvent::PlatformTouchEvent):
+        * platform/qt/PlatformTouchEventQt.cpp:
+        (WebCore::PlatformTouchEvent::PlatformTouchEvent):
+
 2011-02-24  Renata Hodovan  <reni@webkit.org>
 

trunk/Source/WebCore/platform/PlatformTouchEvent.h

@@ -63 +63 @@
         , m_shiftKey(false)
         , m_metaKey(false)
+        , m_timestamp(0)
     {}
 #if PLATFORM(QT)
@@ -82 +83 @@
     bool metaKey() const { return m_metaKey; }
 
+    // Time in seconds.
+    double timestamp() const { return m_timestamp; }
+
 protected:
     TouchEventType m_type;
@@ -89 +93 @@
     bool m_shiftKey;
     bool m_metaKey;
+    double m_timestamp;
 };
 

trunk/Source/WebCore/platform/android/PlatformTouchEventAndroid.cpp

@@ -26 +26 @@
 #include "config.h"
 #include "PlatformTouchEvent.h"
+#include <wtf/CurrentTime.h>
 
 #if ENABLE(TOUCH_EVENTS)
@@ -41 +42 @@
     : m_type(type)
     , m_metaKey(false)
+    , m_timestamp(WTF::currentTime())
 {
     m_touchPoints.reserveCapacity(windowPoints.size());

trunk/Source/WebCore/platform/qt/PlatformTouchEventQt.cpp

@@ -23 +23 @@
 #include "config.h"
 #include "PlatformTouchEvent.h"
+#include <wtf/CurrentTime.h>
 
 #if ENABLE(TOUCH_EVENTS)
@@ -43 +44 @@
     m_shiftKey = (event->modifiers() & Qt::ShiftModifier);
     m_metaKey = (event->modifiers() & Qt::MetaModifier);
+    m_timestamp = WTF::currentTime();
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-02-24  Robert Kroeger <rjkroege@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Added timestamps to PlatformTouchEvent etc.
+
+        PlatformTouchEvent doesn't have a timestamp and so
+        eventSender.leapForward cannot be used for touchevent based tests.
+        This change constructs PlatformTouchEvents with timestamps
+        provided from a WebTouchEvent on chromium. It also adds an enum
+        to make code referring to specific WebTouchPoints easier to read.
+
+        [chromium] [WebCore] [android] Touch events are missing time stamps
+        https://bugs.webkit.org/show_bug.cgi?id=53510
+
+        * public/WebTouchPoint.h:
+        (WebKit::WebTouchPoint::WebTouchPoint):
+        * src/WebInputEventConversion.cpp:
+        (WebKit::PlatformTouchEventBuilder::PlatformTouchEventBuilder):
+
 2011-02-23  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/chromium/public/WebTouchPoint.h

@@ -39 +39 @@
 class WebTouchPoint {
 public:
+    enum Finger {
+        FingerFirst,
+        FingerSecond,
+        FingerThird
+    };
+
     WebTouchPoint()
-        : id(0)
+        : id(FingerFirst)
         , state(StateUndefined) { }
 

trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp

@@ -222 +222 @@
     m_shiftKey = event.modifiers & WebInputEvent::ShiftKey;
     m_metaKey = event.modifiers & WebInputEvent::MetaKey;
+    m_timestamp = event.timeStampSeconds;
 
     for (int i = 0; i < event.touchPointsLength; ++i)