Changeset 30551 in webkit

Timestamp:

Feb 24, 2008 10:48:27 AM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Darin Adler.

• fix float positioning when a float that does not fit on the line is followed by a float that does

Test: fast/block/float/narrow-after-wide.html

• rendering/bidi.cpp: (WebCore::RenderBlock::findNextLineBreak): Changed to not position any more floats on the line once a float that does not fit is encountered. That float should be pushed to the next line, and so should all floats that follow, regardless of whether they can fit on the current line.

LayoutTests:

Reviewed by Darin Adler.

• test float positioning when a float that does not fit on the line is followed by a float that does

• fast/block/float/narrow-after-wide.html: Added.
• platform/mac/fast/block/float/narrow-after-wide-expected.checksum: Added.
• platform/mac/fast/block/float/narrow-after-wide-expected.png: Added.
• platform/mac/fast/block/float/narrow-after-wide-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/float/narrow-after-wide.html (added)
• LayoutTests/platform/mac/fast/block/float/narrow-after-wide-expected.checksum (added)
• LayoutTests/platform/mac/fast/block/float/narrow-after-wide-expected.png (added)
• LayoutTests/platform/mac/fast/block/float/narrow-after-wide-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/bidi.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-02-24  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - test float positioning when a float that does not fit on the line is
+          followed by a float that does
+
+        * fast/block/float/narrow-after-wide.html: Added.
+        * platform/mac/fast/block/float/narrow-after-wide-expected.checksum: Added.
+        * platform/mac/fast/block/float/narrow-after-wide-expected.png: Added.
+        * platform/mac/fast/block/float/narrow-after-wide-expected.txt: Added.
+
 2008-02-24  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-24  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix float positioning when a float that does not fit on the line is
+          followed by a float that does
+
+        Test: fast/block/float/narrow-after-wide.html
+
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::findNextLineBreak): Changed to not position any
+        more floats on the line once a float that does not fit is encountered.
+        That float should be pushed to the next line, and so should all floats
+        that follow, regardless of whether they can fit on the current line.
+
 2008-02-24  Darin Adler  <darin@apple.com>
 

trunk/WebCore/rendering/bidi.cpp

@@ -1408 +1408 @@
 
     bool autoWrapWasEverTrueOnLine = false;
+    bool floatsFitOnLine = true;
     
     // Firefox and Opera will allow a table cell to grow to fit an image inside it under
-    // very specific cirucumstances (in order to match common WinIE renderings). 
+    // very specific circumstances (in order to match common WinIE renderings). 
     // Not supporting the quirk has caused us to mis-render some real sites. (See Bugzilla 10517.) 
     bool allowImagesToBreak = !style()->htmlHacks() || !isTableCell() || !style()->width().isIntrinsicOrAuto();
@@ -1464 +1465 @@
                 // If it does, position it now, otherwise, position
                 // it after moving to next line (in newLine() func)
-                if (o->width() + o->marginLeft() + o->marginRight() + w + tmpW <= width) {
+                if (floatsFitOnLine && o->width() + o->marginLeft() + o->marginRight() + w + tmpW <= width) {
                     positionNewFloats();
                     width = lineWidth(m_height);
-                }
+                } else
+                    floatsFitOnLine = false;
             } else if (o->isPositioned()) {
                 // If our original display wasn't an inline type, then we can