third_party/WebKit/Source/core/paint/BlockPainter.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/BlockPainter.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/page/TouchAdjustment.cpp ('k') | third_party/WebKit/Source/core/paint/EllipsisBoxPainter.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 624d9f10fcf15f28cf637c4772e71eafbf30a16b..08e2e24f9a16c66c87bdebba0e933d65eaa35db1 100644

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

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

@@ -120,10 +120,10 @@ void BlockPainter::paintInlineBox(const InlineBox& inlineBox, const PaintInfo& p

ASSERT(paintInfo.phase != PaintPhaseTextClip);

LayoutPoint childPoint = paintOffset;

- if (inlineBox.parent()->lineLayoutItem().style()->isFlippedBlocksWritingMode()) // Faster than calling containingBlock().

- childPoint = LineLayoutAPIShim::layoutObjectFrom(inlineBox.lineLayoutItem())->containingBlock()->flipForWritingModeForChild(toLayoutBox(LineLayoutAPIShim::layoutObjectFrom(inlineBox.lineLayoutItem())), childPoint);

+ if (inlineBox.parent()->getLineLayoutItem().style()->isFlippedBlocksWritingMode()) // Faster than calling containingBlock().

+ childPoint = LineLayoutAPIShim::layoutObjectFrom(inlineBox.getLineLayoutItem())->containingBlock()->flipForWritingModeForChild(toLayoutBox(LineLayoutAPIShim::layoutObjectFrom(inlineBox.getLineLayoutItem())), childPoint);

- ObjectPainter(*LineLayoutAPIShim::constLayoutObjectFrom(inlineBox.lineLayoutItem())).paintAsPseudoStackingContext(paintInfo, childPoint);

+ ObjectPainter(*LineLayoutAPIShim::constLayoutObjectFrom(inlineBox.getLineLayoutItem())).paintAsPseudoStackingContext(paintInfo, childPoint);

}

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

@@ -136,7 +136,7 @@ void BlockPainter::paintObject(const PaintInfo& paintInfo, const LayoutPoint& pa

// Set previousPaintOffset here in case that m_layoutBlock paints nothing and no

// LayoutObjectDrawingRecorder updates its previousPaintOffset.

// TODO(wangxianzhu): Integrate paint offset checking into new paint invalidation.

- m_layoutBlock.mutableForPainting().setPreviousPaintOffset(paintOffset);

+ m_layoutBlock.getMutableForPainting().setPreviousPaintOffset(paintOffset);

}

const PaintPhase paintPhase = paintInfo.phase;