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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 30675cf81d90b1a38df3354203fc2e834bd6129f
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 9 15:24:13 2010 +0000

    2010-10-09  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [Gtk] Non-rectangular buttons have a square background behind them
            https://bugs.webkit.org/show_bug.cgi?id=23569
    
            Remove some code which was clearing pieces of the GdkDrawable if it was
            currently mapped to a window. In our case it is unnecessary, because the
            platform-independent parts of the render have already cleared this section
            if it is needed.
    
            Mozilla must not trip this code path, which means they are probably rendering
            most often to a non-mapped GdkPixmap.
    
            No new tests as some themed rendering is covered by existing tests that
            render buttons. This particular bug is very hard to test as it only appears
            with certain GTK+ themes and we currently have no mechanism to test different
            themes in DRT.
    
            * platform/gtk/gtk2drawing.c:
            (moz_gtk_button_paint): Remove unnecessary code.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69448 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3df883d..9d31064 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,29 @@
 
         Reviewed by Xan Lopez.
 
+        [Gtk] Non-rectangular buttons have a square background behind them
+        https://bugs.webkit.org/show_bug.cgi?id=23569
+
+        Remove some code which was clearing pieces of the GdkDrawable if it was
+        currently mapped to a window. In our case it is unnecessary, because the
+        platform-independent parts of the render have already cleared this section
+        if it is needed.
+
+        Mozilla must not trip this code path, which means they are probably rendering
+        most often to a non-mapped GdkPixmap.
+
+        No new tests as some themed rendering is covered by existing tests that
+        render buttons. This particular bug is very hard to test as it only appears
+        with certain GTK+ themes and we currently have no mechanism to test different
+        themes in DRT.
+
+        * platform/gtk/gtk2drawing.c:
+        (moz_gtk_button_paint): Remove unnecessary code.
+
+2010-10-09  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Xan Lopez.
+
         [GTK] Slider padding translate into a larger track rect
         https://bugs.webkit.org/show_bug.cgi?id=47435
 
diff --git a/WebCore/platform/gtk/gtk2drawing.c b/WebCore/platform/gtk/gtk2drawing.c
index 941be58..d2d8b20 100644
--- a/WebCore/platform/gtk/gtk2drawing.c
+++ b/WebCore/platform/gtk/gtk2drawing.c
@@ -54,7 +54,6 @@
 
 #define XTHICKNESS(style) (style->xthickness)
 #define YTHICKNESS(style) (style->ythickness)
-#define WINDOW_IS_MAPPED(window) ((window) && GDK_IS_WINDOW(window) && gdk_window_is_visible(window))
 
 static GtkThemeParts *gParts = NULL;
 static style_prop_t style_prop_func;
@@ -383,12 +382,6 @@ moz_gtk_button_paint(GdkDrawable* drawable, GdkRectangle* rect,
 
     moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad);
 
-    if (WINDOW_IS_MAPPED(drawable)) {
-        gdk_window_set_back_pixmap(drawable, NULL, TRUE);
-        gdk_window_clear_area(drawable, cliprect->x, cliprect->y,
-                              cliprect->width, cliprect->height);
-    }
-
     gtk_widget_set_state(widget, button_state);
     gtk_widget_set_direction(widget, direction);
 

-- 
WebKit Debian packaging