third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp - Issue 1647473002: [Line Layout API] Add LineLayoutItem::resolveColor()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp

Issue 1647473002: [Line Layout API] Add LineLayoutItem::resolveColor() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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 | « third_party/WebKit/Source/core/layout/api/LineLayoutItem.h ('k') | third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp

diff --git a/third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp b/third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp

index 03d94a65873fdf60a7a93198ff90a68cbaa94078..71b3e53a72a407a8f9d1102a8e5c368414f6066c 100644

--- a/third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp

+++ b/third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp

@@ -5,7 +5,7 @@

#include "core/paint/EllipsisBoxPainter.h"

#include "core/layout/TextRunConstructor.h"

-#include "core/layout/api/LineLayoutAPIShim.h"

+#include "core/layout/api/LineLayoutItem.h"

#include "core/layout/api/SelectionState.h"

#include "core/layout/line/EllipsisBox.h"

#include "core/layout/line/RootInlineBox.h"

@@ -54,9 +54,9 @@ void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, const LayoutP

else if (paintInfo.phase == PaintPhaseSelection)

return;

- TextPainter::Style textStyle = TextPainter::textPaintingStyle(m_ellipsisBox.layoutObject(), style, paintInfo);

+ TextPainter::Style textStyle = TextPainter::textPaintingStyle(m_ellipsisBox.lineLayoutItem(), style, paintInfo);

if (haveSelection)

- textStyle = TextPainter::selectionPaintingStyle(m_ellipsisBox.layoutObject(), true, paintInfo, textStyle);

+ textStyle = TextPainter::selectionPaintingStyle(m_ellipsisBox.lineLayoutItem(), true, paintInfo, textStyle);

TextRun textRun = constructTextRun(font, m_ellipsisBox.ellipsisStr(), style, TextRun::AllowTrailingExpansion);

LayoutPoint textOrigin(boxOrigin.x(), boxOrigin.y() + font.fontMetrics().ascent());

@@ -66,7 +66,7 @@ void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, const LayoutP

void EllipsisBoxPainter::paintSelection(GraphicsContext& context, const LayoutPoint& boxOrigin, const ComputedStyle& style, const Font& font)

{

- Color textColor = LineLayoutAPIShim::layoutObjectFrom(m_ellipsisBox.lineLayoutItem())->resolveColor(style, CSSPropertyColor);

+ Color textColor = m_ellipsisBox.lineLayoutItem().resolveColor(style, CSSPropertyColor);

Color c = m_ellipsisBox.lineLayoutItem().selectionBackgroundColor();

if (!c.alpha())

return;