Changeset 128853 in webkit

Timestamp:

Sep 17, 2012 11:45:09 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Add NativeWebTouchEvent and handle the Touch event.
​https://bugs.webkit.org/show_bug.cgi?id=90662

Patch by Eunmi Lee <​eunmi15.lee@samsung.com> on 2012-09-17
Reviewed by Gyuyoung Kim.

Implement codes to handle touch event for WebKit2 EFL port.
Additionally, types and structure for touch event are defined because
they are not in the Evas.

• PlatformEfl.cmake:
• Shared/NativeWebTouchEvent.h:

(NativeWebTouchEvent):

• Shared/efl/NativeWebTouchEventEfl.cpp: Added.

(WebKit):
(WebKit::NativeWebTouchEvent::NativeWebTouchEvent):

• Shared/efl/WebEventFactory.cpp:

(WebKit):
(WebKit::typeForTouchEvent):
(WebKit::WebEventFactory::createWebTouchEvent):

• Shared/efl/WebEventFactory.h:

(WebEventFactory):

• UIProcess/API/efl/ewk_touch.h: Added.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PlatformEfl.cmake (modified) (1 diff)
• Shared/NativeWebTouchEvent.h (modified) (2 diffs)
• Shared/efl/NativeWebTouchEventEfl.cpp (copied) (copied from trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h) (2 diffs)
• Shared/efl/WebEventFactory.cpp (modified) (1 diff)
• Shared/efl/WebEventFactory.h (modified) (2 diffs)
• UIProcess/API/efl/ewk_touch.h (copied) (copied from trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-17  Eunmi Lee  <eunmi15.lee@samsung.com>
+
+        [EFL][WK2] Add NativeWebTouchEvent and handle the Touch event.
+        https://bugs.webkit.org/show_bug.cgi?id=90662
+
+        Reviewed by Gyuyoung Kim.
+
+        Implement codes to handle touch event for WebKit2 EFL port.
+        Additionally, types and structure for touch event are defined because
+        they are not in the Evas.
+
+        * PlatformEfl.cmake:
+        * Shared/NativeWebTouchEvent.h:
+        (NativeWebTouchEvent):
+        * Shared/efl/NativeWebTouchEventEfl.cpp: Added.
+        (WebKit):
+        (WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
+        * Shared/efl/WebEventFactory.cpp:
+        (WebKit):
+        (WebKit::typeForTouchEvent):
+        (WebKit::WebEventFactory::createWebTouchEvent):
+        * Shared/efl/WebEventFactory.h:
+        (WebEventFactory):
+        * UIProcess/API/efl/ewk_touch.h: Added.
+
 2012-09-17  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/PlatformEfl.cmake

@@ -18 +18 @@
     Shared/efl/NativeWebWheelEventEfl.cpp
     Shared/efl/NativeWebMouseEventEfl.cpp
+    Shared/efl/NativeWebTouchEventEfl.cpp
     Shared/efl/ProcessExecutablePathEfl.cpp
     Shared/efl/WebEventFactory.cpp

trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h

@@ -31 +31 @@
 #if PLATFORM(QT)
 #include <QTouchEvent>
+#elif PLATFORM(EFL)
+#include "ewk_touch.h"
+#include <Evas.h>
 #endif
 
@@ -39 +42 @@
 #if PLATFORM(QT)
     explicit NativeWebTouchEvent(const QTouchEvent*, const QTransform& fromItemTransform);
+#elif PLATFORM(EFL)
+    NativeWebTouchEvent(Ewk_Touch_Event_Type, const Eina_List*, const Evas_Modifier*, const Evas_Point*, double timestamp);
 #endif
 

trunk/Source/WebKit2/Shared/efl/NativeWebTouchEventEfl.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2011 Benjamin Poulain <benjamin@webkit.org>
+ * Copyright (C) 2012 Samsung Electronics
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#ifndef NativeWebTouchEvent_h
-#define NativeWebTouchEvent_h
+#include "config.h"
+#include "NativeWebTouchEvent.h"
 
-#include "WebEvent.h"
+#include "WebEventFactory.h"
 
-#if PLATFORM(QT)
-#include <QTouchEvent>
-#endif
+#if ENABLE(TOUCH_EVENTS)
 
 namespace WebKit {
 
-class NativeWebTouchEvent : public WebTouchEvent {
-public:
-#if PLATFORM(QT)
-    explicit NativeWebTouchEvent(const QTouchEvent*, const QTransform& fromItemTransform);
-#endif
-
-#if PLATFORM(QT)
-    const QTouchEvent* nativeEvent() const { return &m_nativeEvent; }
-#endif
-
-private:
-#if PLATFORM(QT)
-    const QTouchEvent m_nativeEvent;
-#endif
-};
+NativeWebTouchEvent::NativeWebTouchEvent(Ewk_Touch_Event_Type type, const Eina_List* points, const Evas_Modifier* modifiers, const Evas_Point* position, double timestamp)
+    : WebTouchEvent(WebEventFactory::createWebTouchEvent(type, points, modifiers, position, timestamp))
+{
+}
 
 } // namespace WebKit
 
-#endif // NativeWebTouchEvent_h
+#endif

trunk/Source/WebKit2/Shared/efl/WebEventFactory.cpp

@@ -193 +193 @@
 }
 
+#if ENABLE(TOUCH_EVENTS)
+static inline WebEvent::Type typeForTouchEvent(Ewk_Touch_Event_Type type)
+{
+    if (type == EWK_TOUCH_START)
+        return WebEvent::TouchStart;
+    if (type == EWK_TOUCH_MOVE)
+        return WebEvent::TouchMove;
+    if (type == EWK_TOUCH_END)
+        return WebEvent::TouchEnd;
+    if (type == EWK_TOUCH_CANCEL)
+        return WebEvent::TouchCancel;
+
+    return WebEvent::NoType;
+}
+
+WebTouchEvent WebEventFactory::createWebTouchEvent(Ewk_Touch_Event_Type type, const Eina_List* points, const Evas_Modifier* modifiers, const Evas_Point* position, double timestamp)
+{
+    Vector<WebPlatformTouchPoint> touchPoints;
+    WebPlatformTouchPoint::TouchPointState state;
+    const Eina_List* list;
+    void* item;
+    EINA_LIST_FOREACH(points, list, item) {
+        Ewk_Touch_Point* point = static_cast<Ewk_Touch_Point*>(item);
+
+        switch (point->state) {
+        case EVAS_TOUCH_POINT_UP:
+            state = WebPlatformTouchPoint::TouchReleased;
+            break;
+        case EVAS_TOUCH_POINT_MOVE:
+            state = WebPlatformTouchPoint::TouchMoved;
+            break;
+        case EVAS_TOUCH_POINT_DOWN:
+            state = WebPlatformTouchPoint::TouchPressed;
+            break;
+        case EVAS_TOUCH_POINT_STILL:
+            state = WebPlatformTouchPoint::TouchStationary;
+            break;
+        case EVAS_TOUCH_POINT_CANCEL:
+            state = WebPlatformTouchPoint::TouchCancelled;
+            break;
+        default:
+            ASSERT_NOT_REACHED();
+            break;
+        }
+
+        touchPoints.append(WebPlatformTouchPoint(point->id, state, IntPoint(point->x, point->y), IntPoint(point->x - position->x, point->y - position->y)));
+    }
+
+    return WebTouchEvent(typeForTouchEvent(type), touchPoints, modifiersForEvent(modifiers), timestamp);
+}
+#endif
+
 } // namespace WebKit

trunk/Source/WebKit2/Shared/efl/WebEventFactory.h

@@ -28 +28 @@
 
 #include "WebEvent.h"
+#include "ewk_touch.h"
 #include <Evas.h>
 
@@ -40 +41 @@
     static WebKeyboardEvent createWebKeyboardEvent(const Evas_Event_Key_Down*);
     static WebKeyboardEvent createWebKeyboardEvent(const Evas_Event_Key_Up*);
+#if ENABLE(TOUCH_EVENTS)
+    static WebTouchEvent createWebTouchEvent(Ewk_Touch_Event_Type, const Eina_List*, const Evas_Modifier*, const Evas_Point*, double timestamp);
+#endif
 };
 

trunk/Source/WebKit2/UIProcess/API/efl/ewk_touch.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2011 Benjamin Poulain <benjamin@webkit.org>
+ * Copyright (C) 2012 Samsung Electronics
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#ifndef NativeWebTouchEvent_h
-#define NativeWebTouchEvent_h
+#ifndef ewk_touch_h
+#define ewk_touch_h
 
-#include "WebEvent.h"
+#include <Evas.h>
 
-#if PLATFORM(QT)
-#include <QTouchEvent>
+#ifdef __cplusplus
+extern "C" {
 #endif
 
-namespace WebKit {
+/// Represents types of touch event.
+typedef enum {
+    EWK_TOUCH_START,
+    EWK_TOUCH_MOVE,
+    EWK_TOUCH_END,
+    EWK_TOUCH_CANCEL
+} Ewk_Touch_Event_Type;
 
-class NativeWebTouchEvent : public WebTouchEvent {
-public:
-#if PLATFORM(QT)
-    explicit NativeWebTouchEvent(const QTouchEvent*, const QTransform& fromItemTransform);
+/// Creates a type name for _Ewk_Touch_Point.
+typedef struct _Ewk_Touch_Point Ewk_Touch_Point;
+
+/// Represents a touch point.
+struct _Ewk_Touch_Point {
+    int id; /**< identifier of the touch event */
+    int x; /**< the horizontal position of the touch event */
+    int y; /**< the vertical position of the touch event */
+    Evas_Touch_Point_State state; /**< state of the touch event */
+};
+
+#ifdef __cplusplus
+}
 #endif
 
-#if PLATFORM(QT)
-    const QTouchEvent* nativeEvent() const { return &m_nativeEvent; }
-#endif
-
-private:
-#if PLATFORM(QT)
-    const QTouchEvent m_nativeEvent;
-#endif
-};
-
-} // namespace WebKit
-
-#endif // NativeWebTouchEvent_h
+#endif // ewk_touch_h