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

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f775124dd3d7645952dd88e1ffd8cb5a13621b41
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 26 11:37:10 2010 +0000

    2010-10-26  Xan Lopez  <xlopez at igalia.com>
    
            Restore another mix-up in copy&paste error. Use height for the
            vertical adjustments instead of width.
    
            * platform/gtk/ScrollViewGtk.cpp:
            (WebCore::ScrollView::setVerticalAdjustment):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e89d2ef..1c9b232 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-10-26  Xan Lopez  <xlopez at igalia.com>
 
+        Restore another mix-up in copy&paste error. Use height for the
+        vertical adjustments instead of width.
+
+        * platform/gtk/ScrollViewGtk.cpp:
+        (WebCore::ScrollView::setVerticalAdjustment):
+
+2010-10-26  Xan Lopez  <xlopez at igalia.com>
+
         Restore early return accidentally removed in previous
         patch. Should make API tests pass again.
 
diff --git a/WebCore/platform/gtk/ScrollViewGtk.cpp b/WebCore/platform/gtk/ScrollViewGtk.cpp
index a1dff3b..a8c7562 100644
--- a/WebCore/platform/gtk/ScrollViewGtk.cpp
+++ b/WebCore/platform/gtk/ScrollViewGtk.cpp
@@ -149,11 +149,11 @@ void ScrollView::setVerticalAdjustment(GtkAdjustment* vadj, bool resetValues)
     // able to report correct values.
     int verticalPageStep = max(max<int>(frameRect().width() * Scrollbar::minFractionToStepWhenPaging(), frameRect().width() - Scrollbar::maxOverlapBetweenPages()), 1);
     gtk_adjustment_configure(m_verticalAdjustment.get(),
-                             resetValues ? 0 : scrollOffset().width(), 0,
-                             resetValues ? 0 : contentsSize().width(),
+                             resetValues ? 0 : scrollOffset().height(), 0,
+                             resetValues ? 0 : contentsSize().height(),
                              resetValues ? 0 : Scrollbar::pixelsPerLineStep(),
                              resetValues ? 0 : verticalPageStep,
-                             resetValues ? 0 : frameRect().width());
+                             resetValues ? 0 : frameRect().height());
 }
 
 void ScrollView::setGtkAdjustments(GtkAdjustment* hadj, GtkAdjustment* vadj, bool resetValues)

-- 
WebKit Debian packaging