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
+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
}
// 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);