[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 73296a6263f36e7de3a34899afc234e5e333d30a
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 7 15:55:21 2010 +0000

    2010-09-07  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] [REGRESSION] r66848 caused a crash in testwebview
            https://bugs.webkit.org/show_bug.cgi?id=45298
    
            No new tests as this fixes a test failure.
    
            * platform/gtk/ScrollViewGtk.cpp:
            (WebCore::ScrollView::setGtkAdjustments): Don't actually attach the
            scrollbar adjustments unless this is a main frame ScrollView. If we do
            Scrollbars will be cast incorrectly to MainFrameScrollbarGtk, causing
            a segfault.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66885 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c38e4cd..cb38718 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-07  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] [REGRESSION] r66848 caused a crash in testwebview
+        https://bugs.webkit.org/show_bug.cgi?id=45298
+
+        No new tests as this fixes a test failure.
+
+        * platform/gtk/ScrollViewGtk.cpp:
+        (WebCore::ScrollView::setGtkAdjustments): Don't actually attach the
+        scrollbar adjustments unless this is a main frame ScrollView. If we do
+        Scrollbars will be cast incorrectly to MainFrameScrollbarGtk, causing
+        a segfault.
+
 2010-09-07  Adam Langley  <agl at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebCore/platform/gtk/ScrollViewGtk.cpp b/WebCore/platform/gtk/ScrollViewGtk.cpp
index eb313e0..ebcdaa1 100644
--- a/WebCore/platform/gtk/ScrollViewGtk.cpp
+++ b/WebCore/platform/gtk/ScrollViewGtk.cpp
@@ -91,6 +91,8 @@ void ScrollView::setGtkAdjustments(GtkAdjustment* hadj, GtkAdjustment* vadj, boo
     // time we want to to allow FrameLoaderClientGtk.cpp to call 
     // ScrollView::setGtkAdjustments(0, 0) unconditionally.
     ASSERT(!parent() || !hadj);
+    if (parent())
+        return;
 
     m_horizontalAdjustment = hadj;
     m_verticalAdjustment = vadj;

-- 
WebKit Debian packaging