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

Index: third_party/WebKit/Source/core/layout/LayoutListBox.cpp

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

index 13548dbbca62a7a61840c24f7da4b12ba5918e8b..51f9e719669057f2a8c3b4b2c4f0a20efb0c1434 100644

--- a/third_party/WebKit/Source/core/layout/LayoutListBox.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutListBox.cpp

@@ -96,7 +96,7 @@ unsigned LayoutListBox::size() const

LayoutUnit LayoutListBox::defaultItemHeight() const

{

- return LayoutUnit(style()->fontMetrics().height() + defaultPaddingBottom);

+ return LayoutUnit(style()->getFontMetrics().height() + defaultPaddingBottom);

}

LayoutUnit LayoutListBox::itemHeight() const

@@ -147,8 +147,8 @@ void LayoutListBox::scrollToRect(const LayoutRect& rect)

{

if (hasOverflowClip()) {

ASSERT(layer());

- ASSERT(layer()->scrollableArea());

- layer()->scrollableArea()->scrollIntoView(rect, ScrollAlignment::alignToEdgeIfNeeded, ScrollAlignment::alignToEdgeIfNeeded);

+ ASSERT(layer()->getScrollableArea());

+ layer()->getScrollableArea()->scrollIntoView(rect, ScrollAlignment::alignToEdgeIfNeeded, ScrollAlignment::alignToEdgeIfNeeded);

}