third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

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

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

index 85623d4c7bd72ee817a391de3c3bda140c737fdc..7ebd18c1038c5abab3600b18781de73455941a6b 100644

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

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

@@ -14,8 +14,6 @@

#include "platform/scroll/ScrollableArea.h"

#include "public/platform/Platform.h"

#include "public/platform/WebCompositorSupport.h"

-#include "wtf/PtrUtil.h"

-#include <memory>

namespace blink {

@@ -78,10 +76,10 @@ bool ScrollAnimatorCompositorCoordinator::hasAnimationThatRequiresService() cons

}

bool ScrollAnimatorCompositorCoordinator::addAnimation(

- std::unique_ptr<CompositorAnimation> animation)

+ PassOwnPtr<CompositorAnimation> animation)

{

if (m_compositorPlayer->isLayerAttached()) {

- m_compositorPlayer->addAnimation(animation.release());

+ m_compositorPlayer->addAnimation(animation.leakPtr());

return true;

}

return false;