third_party/WebKit/Source/platform/scroll/ScrollAnimator.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/platform/scroll/ScrollAnimator.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/platform/scroll/ProgrammaticScrollAnimator.h ('k') | third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp

diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp

index bd01119154a16827006a89223f1685d0187f20af..7c5380a78842495676e97c6fc9c01f43bf53fda6 100644

--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp

+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp

@@ -199,7 +199,7 @@ void ScrollAnimator::tickAnimation(double monotonicTime)

if (isFinished)

m_runState = RunState::PostAnimationCleanup;

else

- scrollableArea()->scheduleAnimation();

+ getScrollableArea()->scheduleAnimation();

TRACE_EVENT0("blink", "ScrollAnimator::notifyPositionChanged");

notifyPositionChanged();

@@ -320,7 +320,7 @@ void ScrollAnimator::updateCompositorAnimations()

void ScrollAnimator::addMainThreadScrollingReason()

{

- if (WebLayer* scrollLayer = toWebLayer(scrollableArea()->layerForScrolling())) {

+ if (WebLayer* scrollLayer = toWebLayer(getScrollableArea()->layerForScrolling())) {

scrollLayer->addMainThreadScrollingReasons(

MainThreadScrollingReason::kAnimatingScrollOnMainThread);

}

@@ -328,7 +328,7 @@ void ScrollAnimator::addMainThreadScrollingReason()

void ScrollAnimator::removeMainThreadScrollingReason()

{

- if (WebLayer* scrollLayer = toWebLayer(scrollableArea()->layerForScrolling())) {

+ if (WebLayer* scrollLayer = toWebLayer(getScrollableArea()->layerForScrolling())) {

scrollLayer->clearMainThreadScrollingReasons(

MainThreadScrollingReason::kAnimatingScrollOnMainThread);

}

@@ -391,7 +391,7 @@ void ScrollAnimator::layerForCompositedScrollingDidChange(

bool ScrollAnimator::registerAndScheduleAnimation()

{

- scrollableArea()->registerForAnimation();

+ getScrollableArea()->registerForAnimation();

if (!m_scrollableArea->scheduleAnimation()) {

scrollToOffsetWithoutAnimation(m_targetOffset);

resetAnimationState();