[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[alex at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 8aba44d3a6bcd45cee2265096f12445fabd6547a
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 17 12:06:28 2010 +0000

    2010-11-17  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [gtk] r69119 modified just the gtk2 version of the
            scrolled_window_paint function but not the gtk3 version
            https://bugs.webkit.org/show_bug.cgi?id=49585
    
            Use gtk_paint_shadow the same as the actual code from GTK+. Avoid
            using state and use the same values we are using for gtk2 in the
            paint function.
    
            * platform/gtk/ScrollbarThemeGtk.cpp:
            (WebCore::ScrollbarThemeGtk::paintButton): Initialized the
            depressed attribute of the state variable to avoid using it
            without initialization.
            * platform/gtk/gtk3drawing.c:
            (moz_gtk_scrolled_window_paint):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72191 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7b2a69c..d84c2e2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-17  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [gtk] r69119 modified just the gtk2 version of the
+        scrolled_window_paint function but not the gtk3 version
+        https://bugs.webkit.org/show_bug.cgi?id=49585
+
+        Use gtk_paint_shadow the same as the actual code from GTK+. Avoid
+        using state and use the same values we are using for gtk2 in the
+        paint function.
+
+        * platform/gtk/ScrollbarThemeGtk.cpp:
+        (WebCore::ScrollbarThemeGtk::paintButton): Initialized the
+        depressed attribute of the state variable to avoid using it
+        without initialization.
+        * platform/gtk/gtk3drawing.c:
+        (moz_gtk_scrolled_window_paint):
+
 2010-11-16  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/platform/gtk/ScrollbarThemeGtk.cpp b/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
index f92dd20..10f7e71 100644
--- a/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
+++ b/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
@@ -341,6 +341,7 @@ void ScrollbarThemeGtk::paintButton(GraphicsContext* context, Scrollbar* scrollb
     state.focused = TRUE;
     state.isDefault = TRUE;
     state.canDefault = TRUE;
+    state.depressed = FALSE;
 
     if ((BackButtonStartPart == part && scrollbar->currentPos())
         || (BackButtonEndPart == part && scrollbar->currentPos())
diff --git a/WebCore/platform/gtk/gtk3drawing.c b/WebCore/platform/gtk/gtk3drawing.c
index dda110d..880eb6d 100644
--- a/WebCore/platform/gtk/gtk3drawing.c
+++ b/WebCore/platform/gtk/gtk3drawing.c
@@ -642,8 +642,6 @@ static gint
 moz_gtk_scrolled_window_paint(cairo_t* cr, GdkRectangle* rect,
                               GtkWidgetState* state)
 {
-    GtkStateType state_type = ConvertGtkState(state);
-    GtkShadowType shadow_type = (state->active) ?  GTK_SHADOW_IN : GTK_SHADOW_OUT;
     GtkStyle* style;
     GtkAllocation allocation;
     GtkWidget* widget;
@@ -659,9 +657,9 @@ moz_gtk_scrolled_window_paint(cairo_t* cr, GdkRectangle* rect,
     gtk_widget_set_allocation(widget, &allocation);
 
     style = gtk_widget_get_style(widget);
-    gtk_paint_box(style, cr, state_type, shadow_type,
-                  widget, "scrolled_window", rect->x - 1, rect->y - 1,
-                  rect->width + 2, rect->height + 2);
+    gtk_paint_shadow(style, cr, GTK_STATE_NORMAL, GTK_SHADOW_IN,
+                     widget, "scrolled_window", rect->x , rect->y,
+                     rect->width, rect->height);
     return MOZ_GTK_SUCCESS;
 }
 

-- 
WebKit Debian packaging