Title: [151445] trunk/Source/WebCore
- Revision
- 151445
- Author
- rn...@webkit.org
- Date
- 2013-06-11 11:22:28 -0700 (Tue, 11 Jun 2013)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151444 => 151445)
--- trunk/Source/WebCore/ChangeLog 2013-06-11 18:11:31 UTC (rev 151444)
+++ trunk/Source/WebCore/ChangeLog 2013-06-11 18:22:28 UTC (rev 151445)
@@ -1,3 +1,15 @@
+2013-06-11 Ryosuke Niwa <rn...@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 <rob...@webkit.org>
Painting collapsed borders during scrolling
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (151444 => 151445)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-06-11 18:11:31 UTC (rev 151444)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-06-11 18:22:28 UTC (rev 151445)
@@ -6193,11 +6193,10 @@
}
// 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);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
