Remove redundant calls to ceilToFloat in RenderBlock::computeInlinePreferredLogicalWidths

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

Reviewed by Andreas Kling.

Merge https://chromium.googlesource.com/chromium/blink/+/be336b14325b2938ff6a4fb6191073a6e717a57c.

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeInlinePreferredLogicalWidths):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@151445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ad8c05e0be544db20bc91ff397b6db470f2474cb..26ccd15fcb9664dc5e786f24751d63f22e417efa 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2013-06-11  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Remove redundant calls to ceilToFloat in RenderBlock::computeInlinePreferredLogicalWidths
+        https://bugs.webkit.org/show_bug.cgi?id=117490
+
+        Reviewed by Andreas Kling.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/be336b14325b2938ff6a4fb6191073a6e717a57c.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computeInlinePreferredLogicalWidths):
+
 2013-06-03  Robert Hogan  <robert@webkit.org>
 
         Painting collapsed borders during scrolling

diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp
index fab69a83f6be70501910ffca6fe38e7613a87599..0fb77ad77a6b9339d7a3b1585d18e7031c412d06 100644 (file)
--- a/Source/WebCore/rendering/RenderBlock.cpp
+++ b/Source/WebCore/rendering/RenderBlock.cpp
@@ -6193,11 +6193,10 @@ void RenderBlock::computeInlinePreferredLogicalWidths(LayoutUnit& minLogicalWidt
                 }
 
                 // Add in text-indent.  This is added in only once.
-                LayoutUnit ti = 0;
                 if (!addedTextIndent && !child->isFloating()) {
-                    ti = textIndent;
-                    childMin += ti.ceilToFloat();
-                    childMax += ti.ceilToFloat();
+                    LayoutUnit ceiledIndent = textIndent.ceilToFloat();
+                    childMin += cailedIndent;
+                    childMax += cailedIndent;
 
                     if (childMin < 0)
                         textIndent = adjustFloatForSubPixelLayout(childMin);