Changeset 52127 in webkit

Timestamp:

Dec 14, 2009 7:05:50 PM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/7460655> REGRESSION (r47255): Content shifted down at software.opensuse.org
​https://bugs.webkit.org/show_bug.cgi?id=32382

Reviewed by Darin Adler.

WebCore:

Test: fast/block/float/in-margin.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::getClearDelta): Floats that do not intrude into the line (because
they are in the margin) do not need to be cleared.

LayoutTests:

• fast/block/float/in-margin.html: Added.
• platform/mac/fast/block/float/in-margin-expected.checksum: Added.
• platform/mac/fast/block/float/in-margin-expected.png: Added.
• platform/mac/fast/block/float/in-margin-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/float/in-margin.html (added)
• LayoutTests/platform/mac/fast/block/float/in-margin-expected.checksum (added)
• LayoutTests/platform/mac/fast/block/float/in-margin-expected.png (added)
• LayoutTests/platform/mac/fast/block/float/in-margin-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-14  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/7460655> REGRESSION (r47255): Content shifted down at software.opensuse.org
+        https://bugs.webkit.org/show_bug.cgi?id=32382
+
+        * fast/block/float/in-margin.html: Added.
+        * platform/mac/fast/block/float/in-margin-expected.checksum: Added.
+        * platform/mac/fast/block/float/in-margin-expected.png: Added.
+        * platform/mac/fast/block/float/in-margin-expected.txt: Added.
+
 2009-12-14  Enrica Casucci  <enrica@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-14  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/7460655> REGRESSION (r47255): Content shifted down at software.opensuse.org
+        https://bugs.webkit.org/show_bug.cgi?id=32382
+
+        Test: fast/block/float/in-margin.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::getClearDelta): Floats that do not intrude into the line (because
+        they are in the margin) do not need to be cleared.
+
 2009-12-14  Enrica Casucci  <enrica@apple.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -3196 +3196 @@
     int result = clearSet ? max(0, bottom - yPos) : 0;
     if (!result && child->avoidsFloats()) {
-        int oldYPos = child->y();
-        int oldWidth = child->width();
-        child->setY(yPos);
-        child->calcWidth();
-        if (child->width() > lineWidth(yPos, false) && child->minPrefWidth() <= availableWidth())
-            result = max(0, floatBottom() - yPos);
-        child->setY(oldYPos);
-        child->setWidth(oldWidth);
+        int widthAtCurrentHeight = lineWidth(yPos, false);
+        int availableWidth = this->availableWidth();
+        if (widthAtCurrentHeight < availableWidth) {
+            int oldYPos = child->y();
+            int oldWidth = child->width();
+            child->setY(yPos);
+            child->calcWidth();
+            if (child->width() > widthAtCurrentHeight && child->minPrefWidth() <= availableWidth)
+                result = max(0, floatBottom() - yPos);
+            child->setY(oldYPos);
+            child->setWidth(oldWidth);
+        }
     }
     return result;