third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp - Issue 1584903002: Improvement handling of background and outline paint phases

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/InlineTextBoxPainter.cpp

Issue 1584903002: Improvement handling of background and outline paint phases (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@PaintPhaseRename

Patch Set: Fix TablePainter and TableRowPainter 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/paint/InlinePainter.cpp ('k') | third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp » ('j') | third_party/WebKit/Source/core/paint/PaintPhase.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 91d3f611e7d46b2588143ff228088efd5f80f083..6352be0ac4f05447e9baf8719db63812a73da427 100644

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

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

@@ -58,7 +58,7 @@ void InlineTextBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoint&

if (!shouldPaintTextBox(paintInfo))

return;

- ASSERT(paintInfo.phase != PaintPhaseOutline && paintInfo.phase != PaintPhaseSelfOutline && paintInfo.phase != PaintPhaseDescendantOutlines);

+ ASSERT(!shouldPaintSelfOutline(paintInfo.phase) && !shouldPaintDescendantOutlines(paintInfo.phase));

LayoutRect logicalVisualOverflow = m_inlineTextBox.logicalOverflowRect();

LayoutUnit logicalStart = logicalVisualOverflow.x() + (m_inlineTextBox.isHorizontal() ? paintOffset.x() : paintOffset.y());