Changeset 55572 in webkit

Timestamp:

Mar 4, 2010 10:09:23 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-04 Garret Kelly <​gdk@chromium.org>

Reviewed by Darin Fisher.

Changing private members from PlatformTouchEvent and PlatformTouchPoint
to be protected, so that Chromium's PlatformTouchEventBuilder and
PlatformTouchPointBuilder can access them. Exercised by the
fast/events/touch tests.
​https://bugs.webkit.org/show_bug.cgi?id=35760

• platform/PlatformTouchEvent.h: (WebCore::PlatformTouchEvent::~PlatformTouchEvent):
• platform/PlatformTouchPoint.h: (WebCore::PlatformTouchPoint::~PlatformTouchPoint):

2010-03-04 Garret Kelly <​gdk@chromium.org>

Reviewed by Darin Fisher.

Adding PlatformTouchEventBuilder and PlatformTouchPointBuilder for
converting Chromium WebTouchEvent and WebTouchPoint types to
corresponding WebCore types.
​https://bugs.webkit.org/show_bug.cgi?id=35760

• src/WebInputEventConversion.cpp: (WebKit::toPlatformTouchEventType): (WebKit::toPlatformTouchPointState): (WebKit::PlatformTouchPointBuilder::PlatformTouchPointBuilder): (WebKit::PlatformTouchEventBuilder::PlatformTouchEventBuilder):
• src/WebInputEventConversion.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/PlatformTouchEvent.h (modified) (1 diff)
• WebCore/platform/PlatformTouchPoint.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebInputEventConversion.cpp (modified) (1 diff)
• WebKit/chromium/src/WebInputEventConversion.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-04  Garret Kelly  <gdk@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Changing private members from PlatformTouchEvent and PlatformTouchPoint
+        to be protected, so that Chromium's PlatformTouchEventBuilder and
+        PlatformTouchPointBuilder can access them. Exercised by the
+        fast/events/touch tests.
+        https://bugs.webkit.org/show_bug.cgi?id=35760
+
+        * platform/PlatformTouchEvent.h:
+        (WebCore::PlatformTouchEvent::~PlatformTouchEvent):
+        * platform/PlatformTouchPoint.h:
+        (WebCore::PlatformTouchPoint::~PlatformTouchPoint):
+
 2010-03-04  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/WebCore/platform/PlatformTouchEvent.h

@@ -68 +68 @@
     bool metaKey() const { return m_metaKey; }
 
-private:
+protected:
     TouchEventType m_type;
     Vector<PlatformTouchPoint> m_touchPoints;

trunk/WebCore/platform/PlatformTouchPoint.h

@@ -56 +56 @@
     IntPoint pos() const { return m_pos; }
     
-private:
+protected:
     unsigned m_id;
     State m_state;

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-03-04  Garret Kelly  <gdk@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Adding PlatformTouchEventBuilder and PlatformTouchPointBuilder for
+        converting Chromium WebTouchEvent and WebTouchPoint types to
+        corresponding WebCore types.
+        https://bugs.webkit.org/show_bug.cgi?id=35760
+
+        * src/WebInputEventConversion.cpp:
+        (WebKit::toPlatformTouchEventType):
+        (WebKit::toPlatformTouchPointState):
+        (WebKit::PlatformTouchPointBuilder::PlatformTouchPointBuilder):
+        (WebKit::PlatformTouchEventBuilder::PlatformTouchEventBuilder):
+        * src/WebInputEventConversion.h:
+
 2010-03-04  John Gregg  <johnnyg@google.com>
 

trunk/WebKit/chromium/src/WebInputEventConversion.cpp

@@ -169 +169 @@
 }
 
+#if ENABLE(TOUCH_EVENTS)
+static inline TouchEventType toPlatformTouchEventType(const WebInputEvent::Type type)
+{
+    switch (type) {
+    case WebInputEvent::TouchStart:
+        return TouchStart;
+    case WebInputEvent::TouchMove:
+        return TouchMove;
+    case WebInputEvent::TouchEnd:
+        return TouchEnd;
+    case WebInputEvent::TouchCancel:
+        return TouchCancel;
+    default:
+        ASSERT_NOT_REACHED();
+    }
+}
+
+static inline PlatformTouchPoint::State toPlatformTouchPointState(const WebTouchPoint::State state)
+{
+    switch (state) {
+    case WebTouchPoint::StateReleased:
+        return PlatformTouchPoint::TouchReleased;
+    case WebTouchPoint::StatePressed:
+        return PlatformTouchPoint::TouchPressed;
+    case WebTouchPoint::StateMoved:
+        return PlatformTouchPoint::TouchMoved;
+    case WebTouchPoint::StateStationary:
+        return PlatformTouchPoint::TouchStationary;
+    case WebTouchPoint::StateCancelled:
+        return PlatformTouchPoint::TouchCancelled;
+    case WebTouchPoint::StateUndefined:
+        ASSERT_NOT_REACHED();
+    }
+}
+
+PlatformTouchPointBuilder::PlatformTouchPointBuilder(Widget* widget, const WebTouchPoint& point)
+{
+    m_id = point.id;
+    m_state = toPlatformTouchPointState(point.state);
+    m_pos = widget->convertFromContainingWindow(point.position);
+    m_screenPos = point.screenPosition;
+}
+
+PlatformTouchEventBuilder::PlatformTouchEventBuilder(Widget* widget, const WebTouchEvent& event)
+{
+    m_type = toPlatformTouchEventType(event.type);
+    m_ctrlKey = event.modifiers & WebInputEvent::ControlKey;
+    m_altKey = event.modifiers & WebInputEvent::AltKey;
+    m_shiftKey = event.modifiers & WebInputEvent::ShiftKey;
+    m_metaKey = event.modifiers & WebInputEvent::MetaKey;
+
+    m_touchPoints.resize(event.touchPointsLength);
+    for (int i = 0; i < event.touchPointsLength; ++i)
+        m_touchPoints.append(PlatformTouchPointBuilder(widget, event.touchPoints[i]));
+}
+#endif
+
 static int getWebInputModifiers(const UIEventWithKeyState& event)
 {

trunk/WebKit/chromium/src/WebInputEventConversion.h

@@ -38 +38 @@
 #include "PlatformKeyboardEvent.h"
 #include "PlatformMouseEvent.h"
+#include "PlatformTouchEvent.h"
 #include "PlatformWheelEvent.h"
 
@@ -73 +74 @@
 };
 
+#if ENABLE(TOUCH_EVENTS)
+class PlatformTouchPointBuilder : public WebCore::PlatformTouchPoint {
+public:
+    PlatformTouchPointBuilder(WebCore::Widget*, const WebTouchPoint&);
+};
+
+class PlatformTouchEventBuilder : public WebCore::PlatformTouchEvent {
+public:
+    PlatformTouchEventBuilder(WebCore::Widget*, const WebTouchEvent&);
+};
+#endif
+
 // Converts a WebCore::MouseEvent to a corresponding WebMouseEvent. view is
 // the ScrollView corresponding to the event.  Returns true if successful.