[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[levin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 9d61cd66bc667f8ee0e36d1a2529d1a25022a9ba
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 2 18:26:15 2009 +0000

    Possible crash in RenderSlider::layout.
    https://bugs.webkit.org/show_bug.cgi?id=31016
    
    Patch by David Levin <levin at chromium.org> on 2009-11-02
    Reviewed by Dan Bernstein.
    
    Fix out of place line of code.
    
    Test: scrollbars/overflow-scrollbar-combinations.html
    This crash only seems to repro when WebKit draws the play controls,
    so the crash repros in chromium running this test but not WebKit
    nightlies which use QuickTime to draw the controls.
    
    * rendering/RenderSlider.cpp:
    (WebCore::RenderSlider::layout):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50417 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6a69727..34f90b2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-11-02  David Levin  <levin at chromium.org>
+
+        Reviewed by Dan Bernstein.
+
+        Possible crash in RenderSlider::layout.
+        https://bugs.webkit.org/show_bug.cgi?id=31016
+
+        Fix out of place line of code.
+
+        Test: scrollbars/overflow-scrollbar-combinations.html
+        This crash only seems to repro when WebKit draws the play controls,
+        so the crash repros in chromium running this test but not WebKit
+        nightlies which use QuickTime to draw the controls.
+
+        * rendering/RenderSlider.cpp:
+        (WebCore::RenderSlider::layout):
+
 2009-11-02  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebCore/rendering/RenderSlider.cpp b/WebCore/rendering/RenderSlider.cpp
index 442af39..6448fb9 100644
--- a/WebCore/rendering/RenderSlider.cpp
+++ b/WebCore/rendering/RenderSlider.cpp
@@ -352,10 +352,9 @@ void RenderSlider::layout()
             thumb->repaintDuringLayoutIfMoved(oldThumbRect);
 
         statePusher.pop();
+        addOverflowFromChild(thumb);
     }
 
-    addOverflowFromChild(thumb);
-
     repainter.repaintAfterLayout();    
 
     setNeedsLayout(false);

-- 
WebKit Debian packaging