third_party/WebKit/Source/modules/accessibility/AXLayoutObject.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/modules/accessibility/AXLayoutObject.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/modules/accessibility/AXInlineTextBox.cpp ('k') | third_party/WebKit/Source/platform/PODInterval.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp

diff --git a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp

index 63ffc61f704fada5c5244fcbddee325c7ec99f26..b9a4bc3c5f7f2e6f63f1ad2858abd86a54517e6b 100644

--- a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp

+++ b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp

@@ -1006,7 +1006,7 @@ AXObject* AXLayoutObject::nextOnLine() const

AXObject* result = 0;

for (InlineBox* next = inlineBox->nextOnLine(); next; next = next->nextOnLine()) {

- LayoutObject* layoutObject = LineLayoutAPIShim::layoutObjectFrom(next->lineLayoutItem());

+ LayoutObject* layoutObject = LineLayoutAPIShim::layoutObjectFrom(next->getLineLayoutItem());

result = axObjectCache().getOrCreate(layoutObject);

if (result)

break;

@@ -1035,7 +1035,7 @@ AXObject* AXLayoutObject::previousOnLine() const

AXObject* result = 0;

for (InlineBox* prev = inlineBox->prevOnLine(); prev; prev = prev->prevOnLine()) {

- LayoutObject* layoutObject = LineLayoutAPIShim::layoutObjectFrom(prev->lineLayoutItem());

+ LayoutObject* layoutObject = LineLayoutAPIShim::layoutObjectFrom(prev->getLineLayoutItem());

result = axObjectCache().getOrCreate(layoutObject);

if (result)

break;