Changeset 69448 in webkit

Timestamp:

Oct 9, 2010 8:24:13 AM (14 years ago)

Author:

Martin Robinson

Message:

2010-10-09 Martin Robinson <​mrobinson@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.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/gtk2drawing.c (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-09  Martin Robinson  <mrobinson@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.
+
 2010-10-09  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebCore/platform/gtk/gtk2drawing.c

@@ -55 +55 @@
 #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;
@@ -384 +383 @@
     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);