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

Unified Diff: third_party/WebKit/Source/core/paint/SVGRootInlineBoxPainter.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/SVGInlineTextBoxPainter.cpp ('k') | third_party/WebKit/Source/modules/accessibility/AXInlineTextBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 208cb1f895118a0fbdb85f1be44fb4eb66316234..a3e2f71a8a3c156b06d007cf5090573ff68c9bcf 100644

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

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

@@ -21,12 +21,12 @@ void SVGRootInlineBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoin

{

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

- bool hasSelection = !paintInfo.isPrinting() && m_svgRootInlineBox.selectionState() != SelectionNone;

+ bool hasSelection = !paintInfo.isPrinting() && m_svgRootInlineBox.getSelectionState() != SelectionNone;

PaintInfo paintInfoBeforeFiltering(paintInfo);

- if (hasSelection && !LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfoBeforeFiltering.context, *LineLayoutAPIShim::constLayoutObjectFrom(m_svgRootInlineBox.lineLayoutItem()),

+ if (hasSelection && !LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfoBeforeFiltering.context, *LineLayoutAPIShim::constLayoutObjectFrom(m_svgRootInlineBox.getLineLayoutItem()),

paintInfoBeforeFiltering.phase, paintOffset)) {

- LayoutObjectDrawingRecorder recorder(paintInfoBeforeFiltering.context, *LineLayoutAPIShim::constLayoutObjectFrom(m_svgRootInlineBox.lineLayoutItem()), paintInfoBeforeFiltering.phase,

+ LayoutObjectDrawingRecorder recorder(paintInfoBeforeFiltering.context, *LineLayoutAPIShim::constLayoutObjectFrom(m_svgRootInlineBox.getLineLayoutItem()), paintInfoBeforeFiltering.phase,

paintInfoBeforeFiltering.cullRect().m_rect, paintOffset);

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

if (child->isSVGInlineTextBox())

@@ -36,7 +36,7 @@ void SVGRootInlineBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoin

}

- SVGPaintContext paintContext(*LineLayoutAPIShim::constLayoutObjectFrom(m_svgRootInlineBox.lineLayoutItem()), paintInfoBeforeFiltering);

+ SVGPaintContext paintContext(*LineLayoutAPIShim::constLayoutObjectFrom(m_svgRootInlineBox.getLineLayoutItem()), paintInfoBeforeFiltering);

if (paintContext.applyClipMaskAndFilterIfNecessary()) {

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

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