third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp - Issue 1663963004: Blink Compositor Animation: Use PassOwnPtr in CompositorFactory.

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/ProgrammaticScrollAnimator.cpp

Issue 1663963004: Blink Compositor Animation: Use PassOwnPtr in CompositorFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@curves

Patch Set: Created 4 years, 11 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/graphics/GraphicsLayerTest.cpp ('k') | third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d5ca86e7e344cc66e359bb70b3abb277c09505db..214d1ce844369c64d5c16c9aaee096f28c241143 100644

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

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

@@ -52,10 +52,10 @@ void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset)

{

m_startTime = 0.0;

m_targetOffset = offset;

- m_animationCurve = adoptPtr(CompositorFactory::current().createScrollOffsetAnimationCurve(

+ m_animationCurve = CompositorFactory::current().createScrollOffsetAnimationCurve(

m_targetOffset,

CompositorAnimationCurve::TimingFunctionTypeEaseInOut,

- CompositorScrollOffsetAnimationCurve::ScrollDurationDeltaBased));

+ CompositorScrollOffsetAnimationCurve::ScrollDurationDeltaBased);

m_scrollableArea->registerForAnimation();

if (!m_scrollableArea->scheduleAnimation()) {

@@ -114,7 +114,7 @@ void ProgrammaticScrollAnimator::updateCompositorAnimations()

bool sentToCompositor = false;

if (!m_scrollableArea->shouldScrollOnMainThread()) {

- OwnPtr<CompositorAnimation> animation = adoptPtr(CompositorFactory::current().createAnimation(*m_animationCurve, CompositorAnimation::TargetPropertyScrollOffset));

+ OwnPtr<CompositorAnimation> animation = CompositorFactory::current().createAnimation(*m_animationCurve, CompositorAnimation::TargetPropertyScrollOffset);

int animationId = animation->id();

int animationGroupId = animation->group();