[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 e2cdae9335eae8560ab7cb9132d312ecfa6f2cd1
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 14 02:14:03 2002 +0000

    	Fix for 314799, image at wired.com doesn't show up.  Block
    	level replaced floating elements were being treated as though
    	they didn't float.
    
            Reviewed by gramps
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layoutBlockChildren):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3047 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3aec739..dde203d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2002-12-13  David Hyatt  <hyatt at apple.com>
 
+	Fix for 314799, image at wired.com doesn't show up.  Block
+	level replaced floating elements were being treated as though
+	they didn't float.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-12-13  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3098045.  
 
 	Do not treat XHTML-style tags e.g., <br/> or <table/> as
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3aec739..dde203d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2002-12-13  David Hyatt  <hyatt at apple.com>
 
+	Fix for 314799, image at wired.com doesn't show up.  Block
+	level replaced floating elements were being treated as though
+	they didn't float.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-12-13  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3098045.  
 
 	Do not treat XHTML-style tags e.g., <br/> or <table/> as
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 389edf6..6349965 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -510,7 +510,9 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
         } else if ( child->isReplaced() ) {
             if ( !child->layouted() )
                 child->layout();
-        } else if ( child->isFloating() ) {
+        }
+        
+        if ( child->isFloating() ) {
             insertSpecialObject( child );
             
             // The float should be positioned taking into account the bottom margin

-- 
WebKit Debian packaging