[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 dbbc0bb609bd1da5b7fcea8faa928ffb4aecf3ce
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 19 04:35:14 2010 +0000

    2010-08-18  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] Since the GSEAL changes moz_gtk_scrollbar_button_paint fiddles the widget allocation but doesn't preserve it
            https://bugs.webkit.org/show_bug.cgi?id=44211
    
            No new tests as we do not currently use the scrollbar button painting
            code. Tests for this issue will be enabled when we have pixel tests
            for WebCore-drawn interior frame scrollbars.
    
            * platform/gtk/GtkVersioning.h: Add backward-compatible functions for getting
            and setting the widget allocation.
            * platform/gtk/gtk2drawing.c:
            (moz_gtk_scrollbar_button_paint): Use new backward-compatible functions for getting
            and setting the widget allocation.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7ff13ab..2c02be0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-18  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Since the GSEAL changes moz_gtk_scrollbar_button_paint fiddles the widget allocation but doesn't preserve it
+        https://bugs.webkit.org/show_bug.cgi?id=44211
+
+        No new tests as we do not currently use the scrollbar button painting
+        code. Tests for this issue will be enabled when we have pixel tests
+        for WebCore-drawn interior frame scrollbars.
+
+        * platform/gtk/GtkVersioning.h: Add backward-compatible functions for getting
+        and setting the widget allocation.
+        * platform/gtk/gtk2drawing.c:
+        (moz_gtk_scrollbar_button_paint): Use new backward-compatible functions for getting
+        and setting the widget allocation.
+
 2010-08-18  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/gtk/GtkVersioning.h b/WebCore/platform/gtk/GtkVersioning.h
index 6b45228..34e6081 100644
--- a/WebCore/platform/gtk/GtkVersioning.h
+++ b/WebCore/platform/gtk/GtkVersioning.h
@@ -47,6 +47,8 @@
 #define gtk_widget_set_visible(widget, FALSE) GTK_WIDGET_UNSET_FLAGS((widget), GTK_VISIBLE)
 #define gtk_widget_set_window(widget, new_window) (widget)->window = (new_window)
 #define gtk_widget_set_can_focus(widget, TRUE) GTK_WIDGET_SET_FLAGS((widget), GTK_CAN_FOCUS)
+#define gtk_widget_get_allocation(widget, alloc) (*(alloc) = (widget)->allocation)
+#define gtk_widget_set_allocation(widget, alloc) ((widget)->allocation = *(alloc))
 #endif // GTK_CHECK_VERSION(2, 18, 0)
 
 #if !GTK_CHECK_VERSION(2, 14, 0)
diff --git a/WebCore/platform/gtk/gtk2drawing.c b/WebCore/platform/gtk/gtk2drawing.c
index 80e2c2a..1f1a0a9 100644
--- a/WebCore/platform/gtk/gtk2drawing.c
+++ b/WebCore/platform/gtk/gtk2drawing.c
@@ -1124,11 +1124,7 @@ moz_gtk_scrollbar_button_paint(GdkDrawable* drawable, GdkRectangle* rect,
        to determine where it should paint rounded corners on the buttons.
        We need to trick them into drawing the buttons the way we want them. */
 
-#if GTK_CHECK_VERSION(2, 18, 0)
     gtk_widget_get_allocation(scrollbar, &allocation);
-#else
-    allocation = scrollbar->allocation;
-#endif
     allocation.x = rect->x;
     allocation.y = rect->y;
     allocation.width = rect->width;
@@ -1163,6 +1159,7 @@ moz_gtk_scrollbar_button_paint(GdkDrawable* drawable, GdkRectangle* rect,
         }
     }
 
+    gtk_widget_set_allocation(scrollbar, &allocation);
     style = gtk_widget_get_style(scrollbar);
 
     TSOffsetStyleGCs(style, rect->x, rect->y);

-- 
WebKit Debian packaging