[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit a1993bd6147cc84f9d6c440094f371e1782a92f2
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 19 02:33:51 2002 +0000

    	Fix crash on espn.com.
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::setLayouted):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2745 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a3a4b1b..e8af295 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-11-18  David Hyatt  <hyatt at apple.com>
 
+	Fix crash on espn.com.
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+
+2002-11-18  David Hyatt  <hyatt at apple.com>
+
 	Fix my <konqblock> regression on ign.com.
 	
         * khtml/html/htmlparser.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a3a4b1b..e8af295 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-11-18  David Hyatt  <hyatt at apple.com>
 
+	Fix crash on espn.com.
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+
+2002-11-18  David Hyatt  <hyatt at apple.com>
+
 	Fix my <konqblock> regression on ign.com.
 	
         * khtml/html/htmlparser.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a3a4b1b..e8af295 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-11-18  David Hyatt  <hyatt at apple.com>
 
+	Fix crash on espn.com.
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+
+2002-11-18  David Hyatt  <hyatt at apple.com>
+
 	Fix my <konqblock> regression on ign.com.
 	
         * khtml/html/htmlparser.cpp:
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 1eb8585..d488b9a 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -241,19 +241,21 @@ void RenderObject::setLayouted(bool b)
     else {
         RenderObject *o = m_parent;
         RenderObject *root = this;
-            
+        bool rootAlreadyNeedsLayout = false;
+        
         RenderObject* clippedObj = (style()->overflow() == OHIDDEN) ? this : 0;
         
         while( o ) {
+            root = o;
+            rootAlreadyNeedsLayout = !o->m_layouted;
             o->m_layouted = false;
             if (o->style()->overflow() == OHIDDEN && !clippedObj)
                 clippedObj = o;
-            root = o;
             o = o->m_parent;
         }
         
         if (!gClipObject) {
-            if (clippedObj) {
+            if (clippedObj && !rootAlreadyNeedsLayout) {
                 gClipObject = clippedObj;
                 root->layout();
                 clippedObj->repaint();

-- 
WebKit Debian packaging