Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1215)

Unified Diff: Source/core/layout/line/RootInlineBox.cpp

Issue 1065783002: Remove legacy markup box behavior when line-clamping. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rename new layout test to reflect intent. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/line/RootInlineBox.h ('k') | Source/core/paint/EllipsisBoxPainter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/RootInlineBox.cpp
diff --git a/Source/core/layout/line/RootInlineBox.cpp b/Source/core/layout/line/RootInlineBox.cpp
index c87790ded0821f4bfd0a232b01ac709143418caf..7a0219f5371352154637dcaf3a479019e4e50303 100644
--- a/Source/core/layout/line/RootInlineBox.cpp
+++ b/Source/core/layout/line/RootInlineBox.cpp
@@ -113,12 +113,11 @@ bool RootInlineBox::lineCanAccommodateEllipsis(bool ltr, int blockEdge, int line
return InlineFlowBox::canAccommodateEllipsis(ltr, blockEdge, ellipsisWidth);
}
-FloatWillBeLayoutUnit RootInlineBox::placeEllipsis(const AtomicString& ellipsisStr, bool ltr, FloatWillBeLayoutUnit blockLeftEdge, FloatWillBeLayoutUnit blockRightEdge, FloatWillBeLayoutUnit ellipsisWidth, InlineBox* markupBox)
+FloatWillBeLayoutUnit RootInlineBox::placeEllipsis(const AtomicString& ellipsisStr, bool ltr, FloatWillBeLayoutUnit blockLeftEdge, FloatWillBeLayoutUnit blockRightEdge, FloatWillBeLayoutUnit ellipsisWidth)
{
// Create an ellipsis box.
EllipsisBox* ellipsisBox = new EllipsisBox(layoutObject(), ellipsisStr, this,
- ellipsisWidth - (markupBox ? markupBox->logicalWidth().toFloat() : 0), logicalHeight().toFloat(),
- x(), y(), !prevRootBox(), isHorizontal(), markupBox);
+ ellipsisWidth, logicalHeight().toFloat(), x(), y(), !prevRootBox(), isHorizontal());
if (!gEllipsisBoxMap)
gEllipsisBoxMap = new EllipsisBoxMap();
« no previous file with comments | « Source/core/layout/line/RootInlineBox.h ('k') | Source/core/paint/EllipsisBoxPainter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698