third_party/WebKit/Source/core/layout/svg/SVGTextChunkBuilder.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/layout/svg/SVGTextChunkBuilder.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/layout/svg/SVGLayoutTreeAsText.cpp ('k') | third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/svg/SVGTextChunkBuilder.cpp

diff --git a/third_party/WebKit/Source/core/layout/svg/SVGTextChunkBuilder.cpp b/third_party/WebKit/Source/core/layout/svg/SVGTextChunkBuilder.cpp

index f4f7366d201f1bf3bfb7c84a27303cdb7f5b5838..07cbdc71ca0410d385ec8d2b0d3bddce3dd44864 100644

--- a/third_party/WebKit/Source/core/layout/svg/SVGTextChunkBuilder.cpp

+++ b/third_party/WebKit/Source/core/layout/svg/SVGTextChunkBuilder.cpp

@@ -158,7 +158,7 @@ SVGTextPathChunkBuilder::SVGTextPathChunkBuilder()

void SVGTextPathChunkBuilder::handleTextChunk(BoxListConstIterator boxStart, BoxListConstIterator boxEnd)

{

- const ComputedStyle& style = (*boxStart)->lineLayoutItem().styleRef();

+ const ComputedStyle& style = (*boxStart)->getLineLayoutItem().styleRef();

ChunkLengthAccumulator lengthAccumulator(!style.isHorizontalWritingMode());

lengthAccumulator.processRange(boxStart, boxEnd);

@@ -180,7 +180,7 @@ void SVGTextChunkBuilder::handleTextChunk(BoxListConstIterator boxStart, BoxList

{

ASSERT(*boxStart);

- const LineLayoutSVGInlineText textLineLayout = LineLayoutSVGInlineText((*boxStart)->lineLayoutItem());

+ const LineLayoutSVGInlineText textLineLayout = LineLayoutSVGInlineText((*boxStart)->getLineLayoutItem());

const ComputedStyle& style = textLineLayout.styleRef();

// Handle 'lengthAdjust' property.