Changeset 166698 in webkit

Timestamp:

Apr 2, 2014 11:15:51 PM (10 years ago)

Author:

ryuan.choi@samsung.com

Message:

[EFL][WK1] Use Evas_Touch_Point_State instead of Ewk_Touch_Point_Type
​https://bugs.webkit.org/show_bug.cgi?id=131151

Reviewed by Gyuyoung Kim.

Source/WebKit/efl:

Like ewebkit2, we'd beter to use EFL type instead of WebKit specific type
In addition, changed type of id as int to match with ewebkit2.

• ewk/ewk_frame.h: Replace Ewk_Touch_Point_Type to Evas_Touch_Point_State.
• ewk/ewk_touch_event.cpp:

(toPlatformTouchPointState):

Tools:

• DumpRenderTree/efl/EventSender.cpp: Replace Ewk_Touch_Point_Type to Evas_Touch_Point_State.

(TouchEventInfo::TouchEventInfo):
(sendTouchEvent):
(addTouchPointCallback):
(updateTouchPointCallback):
(cancelTouchPointCallback):
(releaseTouchPointCallback):

Location:

trunk

Files:

• Source/WebKit/efl/ChangeLog (modified) (1 diff)
• Source/WebKit/efl/ewk/ewk_frame.h (modified) (1 diff)
• Source/WebKit/efl/ewk/ewk_touch_event.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/efl/EventSender.cpp (modified) (7 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2014-04-02  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL][WK1] Use Evas_Touch_Point_State instead of Ewk_Touch_Point_Type
+        https://bugs.webkit.org/show_bug.cgi?id=131151
+
+        Reviewed by Gyuyoung Kim.
+
+        Like ewebkit2, we'd beter to use EFL type instead of WebKit specific type
+        In addition, changed type of id as int to match with ewebkit2.
+
+        * ewk/ewk_frame.h: Replace Ewk_Touch_Point_Type to Evas_Touch_Point_State.
+        * ewk/ewk_touch_event.cpp:
+        (toPlatformTouchPointState):
+
 2014-04-02  Martin Hock  <mhock@apple.com>
 

trunk/Source/WebKit/efl/ewk/ewk_frame.h

@@ -234 +234 @@
 } Ewk_Touch_Event_Type;
 
-/// Represents states of touch events.
-typedef enum {
-    EWK_TOUCH_POINT_RELEASED,
-    EWK_TOUCH_POINT_PRESSED,
-    EWK_TOUCH_POINT_MOVED,
-    EWK_TOUCH_POINT_STATIONARY,
-    EWK_TOUCH_POINT_CANCELLED,
-    EWK_TOUCH_POINT_END
-} Ewk_Touch_Point_Type;
-
 /// Creates a type name for _Ewk_Touch_Point.
 typedef struct _Ewk_Touch_Point Ewk_Touch_Point;
 /// Represents a touch point.
 struct _Ewk_Touch_Point {
-    unsigned int id; /**< identifier of the touch event */
+    int id; /**< identifier of the touch event */
     int x; /**< the horizontal position of the touch event */
     int y; /**< the horizontal position of the touch event */
-    Ewk_Touch_Point_Type state; /**< state of the touch event */
+    Evas_Touch_Point_State state; /**< state of the touch event */
 };
 

trunk/Source/WebKit/efl/ewk/ewk_touch_event.cpp

@@ -44 +44 @@
 };
 
-inline static WebCore::PlatformTouchPoint::State toPlatformTouchPointState(Ewk_Touch_Point_Type type)
+inline static WebCore::PlatformTouchPoint::State toPlatformTouchPointState(Evas_Touch_Point_State type)
 {
     switch (type) {
-    case EWK_TOUCH_POINT_RELEASED:
+    case EVAS_TOUCH_POINT_UP:
         return WebCore::PlatformTouchPoint::TouchReleased;
-    case EWK_TOUCH_POINT_PRESSED:
+    case EVAS_TOUCH_POINT_DOWN:
         return WebCore::PlatformTouchPoint::TouchPressed;
-    case EWK_TOUCH_POINT_MOVED:
+    case EVAS_TOUCH_POINT_MOVE:
         return WebCore::PlatformTouchPoint::TouchMoved;
-    case EWK_TOUCH_POINT_STATIONARY:
+    case EVAS_TOUCH_POINT_STILL:
         return WebCore::PlatformTouchPoint::TouchStationary;
-    case EWK_TOUCH_POINT_CANCELLED:
+    case EVAS_TOUCH_POINT_CANCEL:
         return WebCore::PlatformTouchPoint::TouchCancelled;
-    case EWK_TOUCH_POINT_END:
-        return WebCore::PlatformTouchPoint::TouchStateEnd;
     }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2014-04-02  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL][WK1] Use Evas_Touch_Point_State instead of Ewk_Touch_Point_Type
+        https://bugs.webkit.org/show_bug.cgi?id=131151
+
+        Reviewed by Gyuyoung Kim.
+
+        * DumpRenderTree/efl/EventSender.cpp: Replace Ewk_Touch_Point_Type to Evas_Touch_Point_State.
+        (TouchEventInfo::TouchEventInfo):
+        (sendTouchEvent):
+        (addTouchPointCallback):
+        (updateTouchPointCallback):
+        (cancelTouchPointCallback):
+        (releaseTouchPointCallback):
+
 2014-04-02  David Kilzer  <ddkilzer@apple.com>
 

trunk/Tools/DumpRenderTree/efl/EventSender.cpp

@@ -154 +154 @@
 
 struct TouchEventInfo {
-    TouchEventInfo(unsigned id, Ewk_Touch_Point_Type state, const WebCore::IntPoint& point)
+    TouchEventInfo(int id, Evas_Touch_Point_State state, const WebCore::IntPoint& point)
         : state(state)
         , point(point)
@@ -161 +161 @@
     }
 
-    unsigned id;
-    Ewk_Touch_Point_Type state;
+    int id;
+    Evas_Touch_Point_State state;
     WebCore::IntPoint point;
 };
@@ -765 +765 @@
 
     for (unsigned i = 0; i < touchPointList().size(); ) {
-        if (touchPointList().at(i).state == EWK_TOUCH_POINT_RELEASED)
+        if (touchPointList().at(i).state == EVAS_TOUCH_POINT_UP)
             touchPointList().remove(i);
         else {
-            touchPointList().at(i).state = EWK_TOUCH_POINT_STATIONARY;
+            touchPointList().at(i).state = EVAS_TOUCH_POINT_STILL;
             ++i;
         }
@@ -786 +786 @@
     const WebCore::IntPoint point(x, y);
     const unsigned id = touchPointList().isEmpty() ? 0 : touchPointList().last().id + 1;
-    TouchEventInfo eventInfo(id, EWK_TOUCH_POINT_PRESSED, point);
+    TouchEventInfo eventInfo(id, EVAS_TOUCH_POINT_DOWN, point);
     touchPointList().append(eventInfo);
 
@@ -816 +816 @@
     point.setX(x);
     point.setY(y);
-    touchPointList().at(index).state = EWK_TOUCH_POINT_MOVED;
+    touchPointList().at(index).state = EVAS_TOUCH_POINT_MOVE;
 
     return JSValueMakeUndefined(context);
@@ -837 +837 @@
         return JSValueMakeUndefined(context);
 
-    touchPointList().at(index).state = EWK_TOUCH_POINT_CANCELLED;
+    touchPointList().at(index).state = EVAS_TOUCH_POINT_CANCEL;
     return JSValueMakeUndefined(context);
 }
@@ -857 +857 @@
         return JSValueMakeUndefined(context);
 
-    touchPointList().at(index).state = EWK_TOUCH_POINT_RELEASED;
+    touchPointList().at(index).state = EVAS_TOUCH_POINT_UP;
     return JSValueMakeUndefined(context);
 }