third_party/WebKit/Source/core/paint/BlockPainter.cpp - Issue 2292353003: Cherry-pick r415013 to M53.

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

Issue 2292353003: Cherry-pick r415013 to M53. (Closed)

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

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

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

index ae250bfccabca4a2900c7f12483378e5d69586fd..01c904f187163b273c98929d07a493076bc44eee 100644

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

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

@@ -193,12 +193,8 @@ void BlockPainter::paintObject(const PaintInfo& paintInfo, const LayoutPoint& pa

// If the caret's node's layout object's containing block is this block, and the paint action is PaintPhaseForeground,

// then paint the caret.

- if (paintPhase == PaintPhaseForeground && m_layoutBlock.hasCaret() && !LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutBlock, DisplayItem::Caret)) {

- LayoutRect bounds = m_layoutBlock.visualOverflowRect();

- bounds.moveBy(paintOffset);

- LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutBlock, DisplayItem::Caret, bounds);

+ if (paintPhase == PaintPhaseForeground && m_layoutBlock.hasCaret())

paintCarets(paintInfo, paintOffset);

- }

}

void BlockPainter::paintCarets(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)