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

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

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

index af0644c6af449160d38bf2fc1c4999211e6301dd..40c0516610da1f4b4466b06676256e7393350d29 100644

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

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

@@ -396,10 +396,10 @@ static inline void writeSVGInlineTextBox(TextStream& ts, SVGInlineTextBox* textB

if (fragments.isEmpty())

return;

- LineLayoutSVGInlineText textLineLayout = LineLayoutSVGInlineText(textBox->lineLayoutItem());

+ LineLayoutSVGInlineText textLineLayout = LineLayoutSVGInlineText(textBox->getLineLayoutItem());

const SVGComputedStyle& svgStyle = textLineLayout.style()->svgStyle();

- String text = textBox->lineLayoutItem().text();

+ String text = textBox->getLineLayoutItem().text();

unsigned fragmentsSize = fragments.size();

for (unsigned i = 0; i < fragmentsSize; ++i) {