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

[xan at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c1f1c3e97d29081c042d9b9cf43621b159cad038
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 17:42:15 2009 +0000

    2009-10-15  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            Need to initialize event.button.button, since in most cases a
            button number is not passed as an argument.
    
            * DumpRenderTree/gtk/EventSender.cpp:
            (mouseDownCallback):
            (mouseUpCallback):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49638 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 453da8e..d72fe71 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-15  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Need to initialize event.button.button, since in most cases a
+        button number is not passed as an argument.
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (mouseDownCallback):
+        (mouseUpCallback):
+
 2009-10-15  Kevin Ollivier  <kevino at theolliviers.com>
 
         wx build fix. More SDK fixes for Mac, make sure we use the SDK corresponding to
diff --git a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
index 260da21..a36555e 100644
--- a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
@@ -139,6 +139,8 @@ 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));
@@ -179,6 +181,8 @@ 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));

-- 
WebKit Debian packaging