Changeset 143357 in webkit

Timestamp:

Feb 19, 2013 11:00:35 AM (11 years ago)

Author:

eae@chromium.org

Message:

LayoutUnit::epsilon shouldn't be necessary to place floats
​https://bugs.webkit.org/show_bug.cgi?id=94000

Reviewed by Levi Weintraub.

Currently, to get float placement correct, we need to have an
epsilon tolerance in RenderBlock::computeLogicalLocationForFloat
for the width of the line to fit them on. This really shouldn't
be necessary, and probably indicates we're losing precision
elsewhere.

Remove epsilon as it no longer appears to be needed. All layout
tests pass without it.

No new tests, covered by existing tests.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computeLogicalLocationForFloat):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-19  Emil A Eklund  <eae@chromium.org>
+
+        LayoutUnit::epsilon shouldn't be necessary to place floats
+        https://bugs.webkit.org/show_bug.cgi?id=94000
+
+        Reviewed by Levi Weintraub.
+        
+        Currently, to get float placement correct, we need to have an
+        epsilon tolerance in RenderBlock::computeLogicalLocationForFloat
+        for the width of the line to fit them on. This really shouldn't
+        be necessary, and probably indicates we're losing precision
+        elsewhere.
+        
+        Remove epsilon as it no longer appears to be needed. All layout
+        tests pass without it.
+
+        No new tests, covered by existing tests.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computeLogicalLocationForFloat):
+
 2013-02-19  Tim Volodine  <timvolodine@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3997 +3997 @@
         LayoutUnit heightRemainingRight = 1;
         floatLogicalLeft = logicalLeftOffsetForLine(logicalTopOffset, logicalLeftOffset, false, &heightRemainingLeft);
-        // FIXME: LayoutUnit::epsilon is probably only necessary here due to lost precision elsewhere https://bugs.webkit.org/show_bug.cgi?id=94000
-        while (logicalRightOffsetForLine(logicalTopOffset, logicalRightOffset, false, &heightRemainingRight) - floatLogicalLeft + LayoutUnit::epsilon() < floatLogicalWidth) {
+        while (logicalRightOffsetForLine(logicalTopOffset, logicalRightOffset, false, &heightRemainingRight) - floatLogicalLeft < floatLogicalWidth) {
             logicalTopOffset += min(heightRemainingLeft, heightRemainingRight);
             floatLogicalLeft = logicalLeftOffsetForLine(logicalTopOffset, logicalLeftOffset, false, &heightRemainingLeft);
@@ -4013 +4012 @@
         LayoutUnit heightRemainingRight = 1;
         floatLogicalLeft = logicalRightOffsetForLine(logicalTopOffset, logicalRightOffset, false, &heightRemainingRight);
-        // FIXME: LayoutUnit::epsilon is probably only necessary here due to lost precision elsewhere https://bugs.webkit.org/show_bug.cgi?id=94000
-        while (floatLogicalLeft - logicalLeftOffsetForLine(logicalTopOffset, logicalLeftOffset, false, &heightRemainingLeft) + LayoutUnit::epsilon() < floatLogicalWidth) {
+        while (floatLogicalLeft - logicalLeftOffsetForLine(logicalTopOffset, logicalLeftOffset, false, &heightRemainingLeft) < floatLogicalWidth) {
             logicalTopOffset += min(heightRemainingLeft, heightRemainingRight);
             floatLogicalLeft = logicalRightOffsetForLine(logicalTopOffset, logicalRightOffset, false, &heightRemainingRight);