third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp - Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide.

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 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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/testing/Internals.cpp ('k') | third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp » ('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 86546882b36b5664ced2e8d9d53b565660b2fcc4..579c3a73079b905d9cfd4f5573c0dfd0eadd95fe 100644

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

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

@@ -247,7 +247,7 @@ ScrollableArea* AXLayoutObject::getScrollableAreaIfScrollable() const

if (!box->canBeScrolledAndHasScrollableArea())

return 0;

- return box->scrollableArea();

+ return box->getScrollableArea();

}

static bool isImageOrAltText(LayoutBoxModelObject* box, Node* node)

@@ -952,7 +952,7 @@ TextStyle AXLayoutObject::getTextStyle() const

unsigned textStyle = TextStyleNone;

if (style->fontWeight() == FontWeightBold)

textStyle |= TextStyleBold;

- if (style->fontDescription().style() == FontStyleItalic)

+ if (style->getFontDescription().style() == FontStyleItalic)

textStyle |= TextStyleItalic;

if (style->getTextDecoration() == TextDecorationUnderline)

textStyle |= TextStyleUnderline;

@@ -1393,7 +1393,7 @@ void AXLayoutObject::checkCachedElementRect() const

dirty = true;

if (box->canBeScrolledAndHasScrollableArea()) {

- ScrollableArea* scrollableArea = box->scrollableArea();

+ ScrollableArea* scrollableArea = box->getScrollableArea();

if (scrollableArea && scrollableArea->scrollPosition() != m_cachedScrollPosition)

dirty = true;

}

@@ -1417,7 +1417,7 @@ void AXLayoutObject::updateCachedElementRect() const

m_cachedFrameRect = box->frameRect();

if (box->canBeScrolledAndHasScrollableArea()) {

- ScrollableArea* scrollableArea = box->scrollableArea();

+ ScrollableArea* scrollableArea = box->getScrollableArea();

if (scrollableArea)

m_cachedScrollPosition = scrollableArea->scrollPosition();

}