third_party/WebKit/Source/core/paint/SVGInlineFlowBoxPainter.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/SVGInlineFlowBoxPainter.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/RootInlineBoxPainter.cpp ('k') | third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 588b9fbff39c937c0af09d84045f7c7d7dac31cc..b967cc60cd9456cc50c157a959b42ab3ac05a6df 100644

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

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

@@ -32,7 +32,7 @@ void SVGInlineFlowBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoin

{

ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection);

- SVGPaintContext paintContext(*LineLayoutAPIShim::constLayoutObjectFrom(m_svgInlineFlowBox.lineLayoutItem()), paintInfo);

+ SVGPaintContext paintContext(*LineLayoutAPIShim::constLayoutObjectFrom(m_svgInlineFlowBox.getLineLayoutItem()), paintInfo);

if (paintContext.applyClipMaskAndFilterIfNecessary()) {

for (InlineBox* child = m_svgInlineFlowBox.firstChild(); child; child = child->nextOnLine())

child->paint(paintContext.paintInfo(), paintOffset, LayoutUnit(), LayoutUnit());