[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 dc286a5772c9b8b43a34b490b024aef647d27eb9
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 26 10:53:22 2010 +0000

    2010-10-26  Xan Lopez  <xlopez at igalia.com>
    
            Restore early return accidentally removed in previous
            patch. Should make API tests pass again.
    
            * platform/gtk/ScrollViewGtk.cpp:
            (WebCore::ScrollView::setHorizontalAdjustment):
            (WebCore::ScrollView::setVerticalAdjustment):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70515 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3483641..e89d2ef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-10-26  Xan Lopez  <xlopez at igalia.com>
 
+        Restore early return accidentally removed in previous
+        patch. Should make API tests pass again.
+
+        * platform/gtk/ScrollViewGtk.cpp:
+        (WebCore::ScrollView::setHorizontalAdjustment):
+        (WebCore::ScrollView::setVerticalAdjustment):
+
+2010-10-26  Xan Lopez  <xlopez at igalia.com>
+
         Reviewed by Martin Robinson.
 
         [GTK] Port to new GtkScrollable interface in GTK+ 3.x
diff --git a/WebCore/platform/gtk/ScrollViewGtk.cpp b/WebCore/platform/gtk/ScrollViewGtk.cpp
index 891eee0..a1dff3b 100644
--- a/WebCore/platform/gtk/ScrollViewGtk.cpp
+++ b/WebCore/platform/gtk/ScrollViewGtk.cpp
@@ -90,6 +90,8 @@ void ScrollView::setHorizontalAdjustment(GtkAdjustment* hadj, bool resetValues)
         MainFrameScrollbarGtk* hScrollbar = reinterpret_cast<MainFrameScrollbarGtk*>(horizontalScrollbar());
         if (hScrollbar)
             hScrollbar->detachAdjustment();
+
+        return;
     }
 
     // We may be lacking scrollbars when returning to a cached
@@ -99,9 +101,6 @@ void ScrollView::setHorizontalAdjustment(GtkAdjustment* hadj, bool resetValues)
     MainFrameScrollbarGtk* hScrollbar = reinterpret_cast<MainFrameScrollbarGtk*>(horizontalScrollbar());
     hScrollbar->attachAdjustment(m_horizontalAdjustment.get());
 
-    if (!m_horizontalAdjustment)
-        return;
-
     // We used to reset everything to 0 here, but when page cache
     // is enabled we reuse FrameViews that are cached. Since their
     // size is not going to change when being restored, (which is
@@ -130,6 +129,8 @@ void ScrollView::setVerticalAdjustment(GtkAdjustment* vadj, bool resetValues)
         MainFrameScrollbarGtk* vScrollbar = reinterpret_cast<MainFrameScrollbarGtk*>(verticalScrollbar());
         if (vScrollbar)
             vScrollbar->detachAdjustment();
+
+        return;
     }
 
     // We may be lacking scrollbars when returning to a cached
@@ -139,9 +140,6 @@ void ScrollView::setVerticalAdjustment(GtkAdjustment* vadj, bool resetValues)
     MainFrameScrollbarGtk* vScrollbar = reinterpret_cast<MainFrameScrollbarGtk*>(verticalScrollbar());
     vScrollbar->attachAdjustment(m_verticalAdjustment.get());
 
-    if (!m_verticalAdjustment)
-        return;
-
     // We used to reset everything to 0 here, but when page cache
     // is enabled we reuse FrameViews that are cached. Since their
     // size is not going to change when being restored, (which is

-- 
WebKit Debian packaging