Changeset 60489 in webkit

Timestamp:

Jun 1, 2010 11:04:19 AM (14 years ago)

Author:

Martin Robinson

Message:

2010-05-12 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Get more mouse tests passing
​https://bugs.webkit.org/show_bug.cgi?id=39040

Unskip tests that are now passing.

• platform/gtk/Skipped:

2010-06-01 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Get more mouse tests passing
​https://bugs.webkit.org/show_bug.cgi?id=39040

Reproduce the logic from the Windows EventSender for mapping
button numbers to GDK button numbers. Move this logic to the
prepareMouseButtonEvent helper.

• DumpRenderTree/gtk/EventSender.cpp: (prepareMouseButtonEvent): Reproduce Windows logic. (contextClickCallback): Move mapping logic to prepareMouseButtonEvent. (mouseDownCallback): Ditto. (mouseUpCallback): Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (2 diffs)
• LayoutTests/platform/gtk/fast/events/event-sender-mouse-moved-expected.txt (added)
• LayoutTests/platform/gtk/fast/events/mouseout-dead-node-expected.txt (added)
• WebKitTools/ChangeLog (modified) (2 diffs)
• WebKitTools/DumpRenderTree/gtk/EventSender.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-05-12  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Get more mouse tests passing
+        https://bugs.webkit.org/show_bug.cgi?id=39040
+
+        Unskip tests that are now passing.
+
+        * platform/gtk/Skipped:
+
 2010-06-01  Alexey Proskuryakov  <ap@apple.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -1216 +1216 @@
 fast/events/blur-focus-window-should-blur-focus-element.html
 fast/events/content-changed-during-drop.html
-fast/events/context-onmousedown-event.html
 fast/events/crash-on-mutate-during-drop.html
 fast/events/drag-in-frames.html
 fast/events/frame-tab-focus.html
 fast/events/js-keyboard-event-creation.html
-fast/events/mouse-click-events.html
 fast/events/mouseup-from-button2.html
 fast/events/offsetX-offsetY.html
@@ -2143 +2141 @@
 fast/events/context-no-deselect.html
 fast/events/event-listener-on-link.html
-fast/events/event-sender-mouse-moved.html
 fast/events/focusingUnloadedFrame.html
 fast/events/keydown-1.html
 fast/events/label-focus.html
-fast/events/mouseout-dead-node.html
 fast/events/onload-re-entry.html
 fast/events/onloadFrameCrash.html

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-06-01  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Get more mouse tests passing
+        https://bugs.webkit.org/show_bug.cgi?id=39040
+
+        Reproduce the logic from the Windows EventSender for mapping
+        button numbers to GDK button numbers. Move this logic to the
+        prepareMouseButtonEvent helper.
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (prepareMouseButtonEvent): Reproduce Windows logic.
+        (contextClickCallback): Move mapping logic to prepareMouseButtonEvent.
+        (mouseDownCallback): Ditto.
+        (mouseUpCallback): Ditto.
+
 2010-06-01  Alexey Proskuryakov  <ap@apple.com>
 
@@ -34 +51 @@
         to achieve, it seems unnecessary.
 
-2010-06-01  Martin Robinson  <mrobinson@igalia.com>
+2010-05-12  Martin Robinson  <mrobinson@igalia.com>
 
         Reviewed by Xan Lopez.

trunk/WebKitTools/DumpRenderTree/gtk/EventSender.cpp

@@ -110 +110 @@
 }
 
-bool prepareMouseButtonEvent(GdkEvent* event, int button)
+bool prepareMouseButtonEvent(GdkEvent* event, int eventSenderButtonNumber)
 {
     WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
@@ -116 +116 @@
         return false;
 
+    // The logic for mapping EventSender button numbers to GDK button
+    // numbers originates from the Windows EventSender.
+    int gdkButtonNumber = 3;
+    if (eventSenderButtonNumber >= 0 && eventSenderButtonNumber <= 2)
+        gdkButtonNumber = eventSenderButtonNumber + 1;
+
+    // fast/events/mouse-click-events expects the 4th button
+    // to be event.button = 1, so send a middle-button event.
+    else if (eventSenderButtonNumber == 3)
+        gdkButtonNumber = 2;
+
     memset(event, 0, sizeof(event));
-    event->button.button = button;
+    event->button.button = gdkButtonNumber;
     event->button.x = lastMousePositionX;
     event->button.y = lastMousePositionY;
@@ -145 +156 @@
 {
     GdkEvent event;
-    if (!prepareMouseButtonEvent(&event, 3))
+    if (!prepareMouseButtonEvent(&event, 2))
         return JSValueMakeUndefined(context);
 
@@ -184 +195 @@
 static JSValueRef mouseDownCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    int button = 1;
+    int button = 0;
     if (argumentCount == 1) {
-        button = static_cast<int>(JSValueToNumber(context, arguments[0], exception)) + 1;
+        button = static_cast<int>(JSValueToNumber(context, arguments[0], exception));
         g_return_val_if_fail((!exception || !*exception), JSValueMakeUndefined(context));
     }
@@ -229 +240 @@
 static JSValueRef mouseUpCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    int button = 1;
+    int button = 0;
     if (argumentCount == 1) {
-        button = static_cast<int>(JSValueToNumber(context, arguments[0], exception)) + 1;
+        button = static_cast<int>(JSValueToNumber(context, arguments[0], exception));
         g_return_val_if_fail((!exception || !*exception), JSValueMakeUndefined(context));
     }