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

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

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

index 7fadccdae883600cf785ea13431b169f5a99dd71..865eaac6026ea7f636a2ce46526039ea84b7f08f 100644

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

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

@@ -88,7 +88,7 @@ static void collectTextBoxesInFlowBox(InlineFlowBox* flowBox, Vector<SVGInlineTe

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

if (child->isInlineFlowBox()) {

// Skip generated content.

- if (!child->lineLayoutItem().node())

+ if (!child->getLineLayoutItem().node())

continue;

collectTextBoxesInFlowBox(toInlineFlowBox(child), textBoxes);

@@ -105,7 +105,7 @@ typedef bool ProcessTextFragmentCallback(QueryData*, const SVGTextFragment&);

static bool queryTextBox(QueryData* queryData, const SVGInlineTextBox* textBox, ProcessTextFragmentCallback fragmentCallback)

{

queryData->textBox = textBox;

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

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

queryData->isVerticalText = !queryData->textLineLayout.style()->isHorizontalWritingMode();