[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 f00e76479fb8703da90a3de4d1c85e6ea61bacaa
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 01:23:51 2010 +0000

    2010-08-23  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] The Mozilla theme drawing API should expose extra information about scrollbar geometry
            https://bugs.webkit.org/show_bug.cgi?id=44385
    
            Expose the trough_under_steppers property in MozGtkScrollbarMetrics.
    
            No new tests as this does not change functionality.
    
            * platform/gtk/gtk2drawing.c: Set the trough_under_steppers member when accessing theme data.
            * platform/gtk/gtkdrawing.h: Add the trough_under_steppers member.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65850 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c563440..b67923b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-23  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] The Mozilla theme drawing API should expose extra information about scrollbar geometry
+        https://bugs.webkit.org/show_bug.cgi?id=44385
+
+        Expose the trough_under_steppers property in MozGtkScrollbarMetrics.
+
+        No new tests as this does not change functionality.
+
+        * platform/gtk/gtk2drawing.c: Set the trough_under_steppers member when accessing theme data.
+        * platform/gtk/gtkdrawing.h: Add the trough_under_steppers member.
+
 2010-08-23  Darin Adler  <darin at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/WebCore/platform/gtk/gtk2drawing.c b/WebCore/platform/gtk/gtk2drawing.c
index 1f1a0a9..9087917 100644
--- a/WebCore/platform/gtk/gtk2drawing.c
+++ b/WebCore/platform/gtk/gtk2drawing.c
@@ -3044,6 +3044,7 @@ moz_gtk_get_scrollbar_metrics(MozGtkScrollbarMetrics *metrics)
                           "trough_border", &metrics->trough_border,
                           "stepper_size", &metrics->stepper_size,
                           "stepper_spacing", &metrics->stepper_spacing,
+                          "trough_under_steppers", &metrics->trough_under_steppers,
                           NULL);
 
     metrics->min_slider_size = gtk_range_get_min_slider_size(GTK_RANGE(gParts->horizScrollbarWidget));
diff --git a/WebCore/platform/gtk/gtkdrawing.h b/WebCore/platform/gtk/gtkdrawing.h
index b5a7feb..735cc8e 100644
--- a/WebCore/platform/gtk/gtkdrawing.h
+++ b/WebCore/platform/gtk/gtkdrawing.h
@@ -75,6 +75,7 @@ typedef struct {
   gint stepper_size;
   gint stepper_spacing;
   gint min_slider_size;
+  gboolean trough_under_steppers;
 } MozGtkScrollbarMetrics;
 
 typedef struct _GtkThemeParts {

-- 
WebKit Debian packaging