[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 ceb072fa493ca3c2bd88022611cc04d0d929eb4b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 8 22:59:44 2003 +0000

    	Fix for 3166374.  Making the nudie blog work.  My loop for
    	removing floating objects when they got deleted wasn't catching
    	all the cases.
    
            Reviewed by darin
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::removeFromObjectLists):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4048 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4a01a19..d1ef97d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-04-08  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3166374.  Making the nudie blog work.  My loop for
+	removing floating objects when they got deleted wasn't catching
+	all the cases.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::removeFromObjectLists):
+
+2003-04-08  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3220979.  Regression caused by changes to the CSS
 	parser's error handling.  Fix is to narrow my original patch
 	to handle a specific subtype of error for properties.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4a01a19..d1ef97d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-04-08  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3166374.  Making the nudie blog work.  My loop for
+	removing floating objects when they got deleted wasn't catching
+	all the cases.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::removeFromObjectLists):
+
+2003-04-08  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3220979.  Regression caused by changes to the CSS
 	parser's error handling.  Fix is to narrow my original patch
 	to handle a specific subtype of error for properties.
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 181fd5f..a4d0bdd 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1111,13 +1111,10 @@ void RenderObject::invalidateLayout()
 void RenderObject::removeFromObjectLists()
 {
     if (isFloating()) {
-        RenderBlock* outermostBlock = 0;
-        for (RenderObject* p = parent(); p; p = p->parent()) {
-            if (p->isRenderBlock())
-                outermostBlock = static_cast<RenderBlock*>(p);
-            if (!p->isRenderBlock() || !p->containsFloat(this) || p->isFloatingOrPositioned())
-                break;
-	}
+        RenderBlock* outermostBlock = containingBlock();
+        for (RenderBlock* p = outermostBlock;
+             p && !p->isRoot() && p->containsFloat(this) && !p->isFloatingOrPositioned();
+             outermostBlock = p, p = p->containingBlock());
         if (outermostBlock)
             outermostBlock->markAllDescendantsWithFloatsForLayout(this);
     }

-- 
WebKit Debian packaging