[webkit-changes] [133597] trunk/Tools

Tue, 06 Nov 2012 06:13:56 -0800

Title: [133597] trunk/Tools
Revision
133597
Author
[email protected]
Date
2012-11-06 06:15:14 -0800 (Tue, 06 Nov 2012)

Log Message

[EFL][WTR] EventSender: Get rid of the WTRMouseButton enum.
https://bugs.webkit.org/show_bug.cgi?id=101340

Reviewed by Kenneth Rohde Christiansen.

Get rid of an enum which was basically a duplicate of the
WKEventMouseButton one in the shared API.

The only difference is that it also had a case for a 4th mouse
button that we treat in a special way in evasMouseButton() now.

* WebKitTestRunner/EventSenderProxy.h:
(EventSenderProxy):
* WebKitTestRunner/efl/EventSenderProxyEfl.cpp:
(WTR::evasMouseButton):
(WTR::EventSenderProxy::EventSenderProxy):
(WTR::EventSenderProxy::mouseUp):
(WTR::EventSenderProxy::mouseMoveTo):
(WTR::EventSenderProxy::mouseScrollBy):
(WTR::EventSenderProxy::leapForward):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (133596 => 133597)


--- trunk/Tools/ChangeLog	2012-11-06 14:13:13 UTC (rev 133596)
+++ trunk/Tools/ChangeLog	2012-11-06 14:15:14 UTC (rev 133597)
@@ -1,3 +1,26 @@
+2012-11-06  Raphael Kubo da Costa  <[email protected]>
+
+        [EFL][WTR] EventSender: Get rid of the WTRMouseButton enum.
+        https://bugs.webkit.org/show_bug.cgi?id=101340
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Get rid of an enum which was basically a duplicate of the
+        WKEventMouseButton one in the shared API.
+
+        The only difference is that it also had a case for a 4th mouse
+        button that we treat in a special way in evasMouseButton() now.
+
+        * WebKitTestRunner/EventSenderProxy.h:
+        (EventSenderProxy):
+        * WebKitTestRunner/efl/EventSenderProxyEfl.cpp:
+        (WTR::evasMouseButton):
+        (WTR::EventSenderProxy::EventSenderProxy):
+        (WTR::EventSenderProxy::mouseUp):
+        (WTR::EventSenderProxy::mouseMoveTo):
+        (WTR::EventSenderProxy::mouseScrollBy):
+        (WTR::EventSenderProxy::leapForward):
+
 2012-11-06  Jussi Kukkonen  <[email protected]>
 
         [EFL][WK2] Minibrowser forgets http variables when url includes ampersand

Modified: trunk/Tools/WebKitTestRunner/EventSenderProxy.h (133596 => 133597)


--- trunk/Tools/WebKitTestRunner/EventSenderProxy.h	2012-11-06 14:13:13 UTC (rev 133596)
+++ trunk/Tools/WebKitTestRunner/EventSenderProxy.h	2012-11-06 14:15:14 UTC (rev 133597)
@@ -127,7 +127,7 @@
 #endif
 #elif PLATFORM(EFL)
     Deque<WTREvent> m_eventQueue;
-    unsigned m_mouseButton;
+    WKEventMouseButton m_mouseButton;
 #if ENABLE(TOUCH_EVENTS)
     Eina_List* m_touchPoints;
 #endif

Modified: trunk/Tools/WebKitTestRunner/efl/EventSenderProxyEfl.cpp (133596 => 133597)


--- trunk/Tools/WebKitTestRunner/efl/EventSenderProxyEfl.cpp	2012-11-06 14:13:13 UTC (rev 133596)
+++ trunk/Tools/WebKitTestRunner/efl/EventSenderProxyEfl.cpp	2012-11-06 14:15:14 UTC (rev 133597)
@@ -56,14 +56,6 @@
     WTREventTypeLeapForward
 };
 
-enum WTRMouseButton {
-    WTRMouseButtonNone = -1,
-    WTRMouseButtonLeft,
-    WTRMouseButtonMiddle,
-    WTRMouseButtonRight,
-    WTRMouseButtonMiddleDuplicated,
-};
-
 enum EvasMouseButton {
     EvasMouseButtonNone = 0,
     EvasMouseButtonLeft,
@@ -121,15 +113,14 @@
 
 static unsigned evasMouseButton(unsigned button)
 {
-    if (button == WTRMouseButtonLeft)
-        return EvasMouseButtonLeft;
-    if (button == WTRMouseButtonMiddle)
+    // The common case involves converting from a WKEventMouseButton (which
+    // starts at -1) to an EvasMouseButton (which a starts at 0). The special
+    // case for button 3 exists because of fast/events/mouse-click-events.html,
+    // which tests whether a 4th mouse button behaves as the middle one.
+    if (button <= kWKEventMouseButtonRightButton)
+        return button + 1;
+    if (button == kWKEventMouseButtonRightButton + 1)
         return EvasMouseButtonMiddle;
-    if (button == WTRMouseButtonRight)
-        return EvasMouseButtonRight;
-    if (button == WTRMouseButtonMiddleDuplicated)
-        return EvasMouseButtonMiddle;
-
     return EvasMouseButtonNone;
 }
 
@@ -292,8 +283,8 @@
     , m_leftMouseButtonDown(false)
     , m_clickCount(0)
     , m_clickTime(0)
-    , m_clickButton(WTRMouseButtonNone)
-    , m_mouseButton(WTRMouseButtonNone)
+    , m_clickButton(kWKEventMouseButtonNoButton)
+    , m_mouseButton(kWKEventMouseButtonNoButton)
 #if ENABLE(TOUCH_EVENTS)
     , m_touchPoints(0)
 #endif
@@ -371,7 +362,7 @@
     sendOrQueueEvent(WTREvent(WTREventTypeMouseUp, 0, wkModifiers, evasMouseButton(button)));
 
     if (m_mouseButton == button)
-        m_mouseButton = WTRMouseButtonNone;
+        m_mouseButton = kWKEventMouseButtonNoButton;
 
     m_clickPosition = m_position;
     m_clickTime = ecore_time_get();
@@ -382,12 +373,12 @@
     m_position.x = x;
     m_position.y = y;
 
-    sendOrQueueEvent(WTREvent(WTREventTypeMouseMove, 0, 0, WTRMouseButtonNone));
+    sendOrQueueEvent(WTREvent(WTREventTypeMouseMove, 0, 0, kWKEventMouseButtonNoButton));
 }
 
 void EventSenderProxy::mouseScrollBy(int horizontal, int vertical)
 {
-    WTREvent event(WTREventTypeMouseScrollBy, 0, 0, WTRMouseButtonNone);
+    WTREvent event(WTREventTypeMouseScrollBy, 0, 0, kWKEventMouseButtonNoButton);
     // We need to invert scrolling values since in EFL negative z value means that
     // canvas is scrolling down
     event.horizontal = -horizontal;
@@ -403,7 +394,7 @@
 void EventSenderProxy::leapForward(int milliseconds)
 {
     if (m_eventQueue.isEmpty())
-        m_eventQueue.append(WTREvent(WTREventTypeLeapForward, milliseconds, 0, WTRMouseButtonNone));
+        m_eventQueue.append(WTREvent(WTREventTypeLeapForward, milliseconds, 0, kWKEventMouseButtonNoButton));
 
     m_time += milliseconds / 1000.0;
 }

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to