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

Unified Diff: Source/core/paint/EllipsisBoxPainter.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/paint/EllipsisBoxPainter.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/EllipsisBoxPainter.cpp
diff --git a/Source/core/paint/EllipsisBoxPainter.cpp b/Source/core/paint/EllipsisBoxPainter.cpp
index 884fc5fcaca15b9b250c6a24f252572a1541a695..e58699999020f52ab6ca3cb39287d86ff8c1b3aa 100644
--- a/Source/core/paint/EllipsisBoxPainter.cpp
+++ b/Source/core/paint/EllipsisBoxPainter.cpp
@@ -19,7 +19,6 @@ void EllipsisBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& pa
{
const ComputedStyle& style = m_ellipsisBox.layoutObject().styleRef(m_ellipsisBox.isFirstLineStyle());
paintEllipsis(paintInfo, paintOffset, lineTop, lineBottom, style);
- paintMarkupBox(paintInfo, paintOffset, lineTop, lineBottom, style);
}
void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, const ComputedStyle& style)
@@ -56,18 +55,6 @@ void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, const LayoutP
textPainter.paint(0, m_ellipsisBox.ellipsisStr().length(), m_ellipsisBox.ellipsisStr().length(), textStyle);
}
-void EllipsisBoxPainter::paintMarkupBox(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, const ComputedStyle& style)
-{
- InlineBox* markupBox = m_ellipsisBox.markupBox();
- if (!markupBox)
- return;
-
- LayoutPoint adjustedPaintOffset = paintOffset;
- adjustedPaintOffset.move(m_ellipsisBox.x() + m_ellipsisBox.logicalWidth() - markupBox->x(),
- m_ellipsisBox.y() + style.fontMetrics().ascent() - (markupBox->y() + markupBox->layoutObject().styleRef(m_ellipsisBox.isFirstLineStyle()).fontMetrics().ascent()));
- markupBox->paint(paintInfo, adjustedPaintOffset, lineTop, lineBottom);
-}
-
void EllipsisBoxPainter::paintSelection(GraphicsContext* context, const FloatPoint& boxOrigin, const ComputedStyle& style, const Font& font)
{
Color textColor = m_ellipsisBox.layoutObject().resolveColor(style, CSSPropertyColor);
« no previous file with comments | « Source/core/paint/EllipsisBoxPainter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698