Changeset 82303 in webkit

Timestamp:

Mar 29, 2011, 12:47:35 PM (14 years ago)

Author:

[email protected]

Message:

<rdar://problem/9194927> REGRESSION (r81691): Page at www.mondaynote.com lays out incorrectly

Reviewed by Simon Fraser.

Back out the optimization that stopped when it hit the first float. This was an incorrect optimization
and can't be done without more work.

Source/WebCore:

Added fast/block/float/float-forced-below-other-floats.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::logicalLeftOffsetForLine):
(WebCore::RenderBlock::logicalRightOffsetForLine):

LayoutTests:

Added fast/block/float/float-below-other-floats.html

• fast/block/float/float-forced-below-other-floats.html: Added.
• platform/mac/fast/block/float/float-forced-below-other-floats-expected.checksum: Added.
• platform/mac/fast/block/float/float-forced-below-other-floats-expected.png: Added.
• platform/mac/fast/block/float/float-forced-below-other-floats-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/float/float-forced-below-other-floats.html (added)
• LayoutTests/platform/mac/fast/block/float/float-forced-below-other-floats-expected.checksum (added)
• LayoutTests/platform/mac/fast/block/float/float-forced-below-other-floats-expected.png (added)
• LayoutTests/platform/mac/fast/block/float/float-forced-below-other-floats-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-03-29  David Hyatt  <[email protected]>
+
+        Reviewed by Simon Fraser.
+
+        <rdar://problem/9194927> REGRESSION (r81691): Page at www.mondaynote.com lays out incorrectly
+        
+        Back out the optimization that stopped when it hit the first float. This was an incorrect optimization
+        and can't be done without more work.
+
+        Added fast/block/float/float-below-other-floats.html
+
+        * fast/block/float/float-forced-below-other-floats.html: Added.
+        * platform/mac/fast/block/float/float-forced-below-other-floats-expected.checksum: Added.
+        * platform/mac/fast/block/float/float-forced-below-other-floats-expected.png: Added.
+        * platform/mac/fast/block/float/float-forced-below-other-floats-expected.txt: Added.
+
 2011-03-29  Adam Roben  <[email protected]>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-29  David Hyatt  <[email protected]>
+
+        Reviewed by Simon Fraser.
+
+        <rdar://problem/9194927> REGRESSION (r81691): Page at www.mondaynote.com lays out incorrectly
+        
+        Back out the optimization that stopped when it hit the first float. This was an incorrect optimization
+        and can't be done without more work.
+
+        Added fast/block/float/float-forced-below-other-floats.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::logicalLeftOffsetForLine):
+        (WebCore::RenderBlock::logicalRightOffsetForLine):
+
 2011-03-29  Eric Seidel  <[email protected]>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3456 +3456 @@
 }
 
+// FIXME: The logicalLeftOffsetForLine/logicalRightOffsetForLine functions are very slow if there are many floats
+// present. We need to add a structure to floating objects to represent "lines" of floats.  Then instead of checking
+// each float individually, we'd just walk backwards through the "lines" and stop when we hit a line that is fully above
+// the vertical offset that we'd like to check.  Computing the "lines" would be rather complicated, but could replace the left
+// objects and right objects count hack that is currently used here.
 int RenderBlock::logicalLeftOffsetForLine(int logicalTop, int fixedOffset, bool applyTextIndent, int* heightRemaining) const
 {
@@ -3475 +3480 @@
                 && r->type() == FloatingObject::FloatLeft
                 && logicalRightForFloat(r) > left) {
-                left = logicalRightForFloat(r);
+                left = max(left, logicalRightForFloat(r));
                 if (heightRemaining)
                     *heightRemaining = logicalBottomForFloat(r) - logicalTop;
-                break;
             }
         } while (it != begin);
@@ -3513 +3517 @@
                 && r->type() == FloatingObject::FloatRight
                 && logicalLeftForFloat(r) < right) {
-                right = logicalLeftForFloat(r);
+                right = min(right, logicalLeftForFloat(r));
                 if (heightRemaining)
                     *heightRemaining = logicalBottomForFloat(r) - logicalTop;
-                break;
             }
         } while (it != begin);