[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 83aa31e108dc9d7d1b122ea2babb1eef7677f2b3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 8 21:12:20 2009 +0000

    2009-10-08  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] Added support for a parameter setting the button that was
            pressed in the mouseDown function.
            https://bugs.webkit.org/show_bug.cgi?id=30220
    
            * WebKitTools/DumpRenderTree/gtk/EventSender.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49318 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8e879d2..28d9583 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Xan Lopez.
 
+        [GTK] Added support for a parameter setting the button that was
+        pressed in the mouseDown function.
+        https://bugs.webkit.org/show_bug.cgi?id=30220
+
+        * WebKitTools/DumpRenderTree/gtk/EventSender.cpp:
+
+2009-10-08  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Xan Lopez.
+
         [GTK] Added a line to the bottom of the expected result to match
         the output of the test.
         https://bugs.webkit.org/show_bug.cgi?id=30220
diff --git a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
index c3c72c1..260da21 100644
--- a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
@@ -139,7 +139,10 @@ static JSValueRef mouseDownCallback(JSContextRef context, JSObjectRef function,
     GdkEvent event;
     memset(&event, 0, sizeof(event));
     event.type = GDK_BUTTON_PRESS;
-    event.button.button = 1;
+    if (argumentCount == 1) {
+        event.button.button = (int)JSValueToNumber(context, arguments[0], exception) + 1;
+        g_return_val_if_fail((!exception || !*exception), JSValueMakeUndefined(context));
+    }
     event.button.x = lastMousePositionX;
     event.button.y = lastMousePositionY;
     event.button.window = GTK_WIDGET(view)->window;
@@ -176,7 +179,10 @@ static JSValueRef mouseUpCallback(JSContextRef context, JSObjectRef function, JS
     GdkEvent event;
     memset(&event, 0, sizeof(event));
     event.type = GDK_BUTTON_RELEASE;
-    event.button.button = 1;
+    if (argumentCount == 1) {
+        event.button.button = (int)JSValueToNumber(context, arguments[0], exception) + 1;
+        g_return_val_if_fail((!exception || !*exception), JSValueMakeUndefined(context));
+    }
     event.button.x = lastMousePositionX;
     event.button.y = lastMousePositionY;
     event.button.window = GTK_WIDGET(view)->window;

-- 
WebKit Debian packaging