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

Sat Sep 26 06:27:11 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 4293d28b8a877e3e7fe2accd7afa682e57af3109
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 24 22:59:56 2002 +0000

    	Fix for bug 2953423, viamichelin.com lays out incorrectly.
    	Remove a completely bogus optimization in the KHTML code that
    	attempted to bail when the specified width was 0.  This was
    	a very basic problem, and it should fix other pages that were
    	laying out incorrectly as well.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layout):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1663 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b442778..a10767d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-07-24  David Hyatt  <hyatt at apple.com>
+
+	Fix for bug 2953423, viamichelin.com lays out incorrectly.
+	Remove a completely bogus optimization in the KHTML code that
+	attempted to bail when the specified width was 0.  This was
+	a very basic problem, and it should fix other pages that were
+	laying out incorrectly as well.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layout):
+
 2002-07-24  Darin Adler  <darin at apple.com>
 
         * khtml/khtml_part.cpp: (KHTMLPart::clear): Remove code that reset m_frameNameId,
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b442778..a10767d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-07-24  David Hyatt  <hyatt at apple.com>
+
+	Fix for bug 2953423, viamichelin.com lays out incorrectly.
+	Remove a completely bogus optimization in the KHTML code that
+	attempted to bail when the specified width was 0.  This was
+	a very basic problem, and it should fix other pages that were
+	laying out incorrectly as well.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layout):
+
 2002-07-24  Darin Adler  <darin at apple.com>
 
         * khtml/khtml_part.cpp: (KHTMLPart::clear): Remove code that reset m_frameNameId,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b442778..a10767d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-07-24  David Hyatt  <hyatt at apple.com>
+
+	Fix for bug 2953423, viamichelin.com lays out incorrectly.
+	Remove a completely bogus optimization in the KHTML code that
+	attempted to bail when the specified width was 0.  This was
+	a very basic problem, and it should fix other pages that were
+	laying out incorrectly as well.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layout):
+
 2002-07-24  Darin Adler  <darin at apple.com>
 
         * khtml/khtml_part.cpp: (KHTMLPart::clear): Remove code that reset m_frameNameId,
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index fc8481f..4e66708 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -252,12 +252,24 @@ void RenderFlow::layout()
         kdDebug( 6040 ) << renderName() << ": containingBlock == this" << endl;
 #endif
 
-    if(m_width<=0 && !isPositioned() && !overhangingContents()) {
+    // This is an incorrect optimization.  You cannot know at this point whether or not a child will overhang
+    // in the horizontal direction without laying out your children.  The following test case illustrates this
+    // point, as it will fail with this code commented back in.
+    // <html>
+    // <body style="width:0px">
+    // Hello world!
+    // </body>
+    // </html>
+    //
+    // In the real world, this affects (as of 7/24/2002) http://viamichelin.com/. -- dwh
+    // 
+    /*   if(m_width<=0 && !isPositioned() && !overhangingContents()) {
         if(m_y < 0) m_y = 0;
         setLayouted();
         return;
     }
-
+    */
+    
     clearFloats();
 
     m_height = 0;

-- 
WebKit Debian packaging

