Changeset 97391 in webkit

Timestamp:

Oct 13, 2011 1:37:28 PM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=70049

[CSS Regions] Add a test of a float being pushed down because it can't fit
next to another float and make sure it re-evaluates its position when it changes
regions as a result of the push.

Reviewed by Sam Weinig.

Source/WebCore:

Added new test in fast/regions.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computeLogicalLocationForFloat):

LayoutTests:

• fast/regions/float-pushed-width-change.html: Added.
• platform/mac/fast/regions/float-pushed-width-change-expected.png: Added.
• platform/mac/fast/regions/float-pushed-width-change-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/float-pushed-width-change.html (added)
• LayoutTests/platform/mac/fast/regions/float-pushed-width-change-expected.png (added)
• LayoutTests/platform/mac/fast/regions/float-pushed-width-change-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-13  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=70049
+        
+        [CSS Regions] Add a test of a float being pushed down because it can't fit
+        next to another float and make sure it re-evaluates its position when it changes
+        regions as a result of the push.
+
+        Reviewed by Sam Weinig.
+
+        * fast/regions/float-pushed-width-change.html: Added.
+        * platform/mac/fast/regions/float-pushed-width-change-expected.png: Added.
+        * platform/mac/fast/regions/float-pushed-width-change-expected.txt: Added.
+
 2011-10-13  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-13  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=70049
+        
+        [CSS Regions] Add a test of a float being pushed down because it can't fit
+        next to another float and make sure it re-evaluates its position when it changes
+        regions as a result of the push.
+
+        Reviewed by Sam Weinig.
+
+        Added new test in fast/regions.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computeLogicalLocationForFloat):
+
 2011-10-13  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3327 +3327 @@
     LayoutUnit logicalRightOffset = logicalRightOffsetForContent(logicalTopOffset); // Constant part of right offset.
     LayoutUnit logicalLeftOffset = logicalLeftOffsetForContent(logicalTopOffset); // Constant part of left offset.
-    LayoutUnit floatLogicalWidth = logicalWidthForFloat(floatingObject); // The width we look for.
-    if (logicalRightOffset - logicalLeftOffset < floatLogicalWidth)
-        floatLogicalWidth = logicalRightOffset - logicalLeftOffset; // Never look for more than what will be available.
-       
+    LayoutUnit floatLogicalWidth = min(logicalWidthForFloat(floatingObject), logicalRightOffset - logicalLeftOffset); // The width we look for.
+
     LayoutUnit floatLogicalLeft;
 
@@ -3340 +3338 @@
             logicalTopOffset += min(heightRemainingLeft, heightRemainingRight);
             floatLogicalLeft = logicalLeftOffsetForLine(logicalTopOffset, logicalLeftOffset, false, &heightRemainingLeft);
+            if (inRenderFlowThread()) {
+                // Have to re-evaluate all of our offsets, since they may have changed.
+                logicalRightOffset = logicalRightOffsetForContent(logicalTopOffset); // Constant part of right offset.
+                logicalLeftOffset = logicalLeftOffsetForContent(logicalTopOffset); // Constant part of left offset.
+                floatLogicalWidth = min(logicalWidthForFloat(floatingObject), logicalRightOffset - logicalLeftOffset);
+            }
         }
         floatLogicalLeft = max<LayoutUnit>(logicalLeftOffset - borderAndPaddingLogicalLeft(), floatLogicalLeft);
@@ -3349 +3353 @@
             logicalTopOffset += min(heightRemainingLeft, heightRemainingRight);
             floatLogicalLeft = logicalRightOffsetForLine(logicalTopOffset, logicalRightOffset, false, &heightRemainingRight);
+            if (inRenderFlowThread()) {
+                // Have to re-evaluate all of our offsets, since they may have changed.
+                logicalRightOffset = logicalRightOffsetForContent(logicalTopOffset); // Constant part of right offset.
+                logicalLeftOffset = logicalLeftOffsetForContent(logicalTopOffset); // Constant part of left offset.
+                floatLogicalWidth = min(logicalWidthForFloat(floatingObject), logicalRightOffset - logicalLeftOffset);
+            }
         }
         floatLogicalLeft -= logicalWidthForFloat(floatingObject); // Use the original width of the float here, since the local variable