third_party/WebKit/Source/core/paint/ReplacedPainter.cpp - Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/.

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

Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-6

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

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

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

index fd4878c626a4a99c4ad0e22ca4d85cd6d60913d0..0d0a0303db9e28e034acfb5d0058443288eaa676 100644

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

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

@@ -50,7 +50,7 @@ void ReplacedPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paint

return;

if (paintInfo.phase == PaintPhaseSelection)

- if (m_layoutReplaced.selectionState() == SelectionNone)

+ if (m_layoutReplaced.getSelectionState() == SelectionNone)

return;

{

@@ -84,7 +84,7 @@ void ReplacedPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paint

// The selection tint never gets clipped by border-radius rounding, since we want it to run right up to the edges of

// surrounding content.

- bool drawSelectionTint = paintInfo.phase == PaintPhaseForeground && m_layoutReplaced.selectionState() != SelectionNone && !paintInfo.isPrinting();

+ bool drawSelectionTint = paintInfo.phase == PaintPhaseForeground && m_layoutReplaced.getSelectionState() != SelectionNone && !paintInfo.isPrinting();

if (drawSelectionTint && !LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutReplaced, DisplayItem::SelectionTint, adjustedPaintOffset)) {

LayoutRect selectionPaintingRect = m_layoutReplaced.localSelectionRect();

selectionPaintingRect.moveBy(adjustedPaintOffset);