third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h - 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.h

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

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

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

index d0cecc2aff2c1d488e4a59013cf1b73154506f8b..bf111dd4e8ff80e460471c8a7012756c1c366eca 100644

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

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

@@ -16,7 +16,7 @@

#include "platform/scroll/ScrollTypes.h"

#include "wtf/Allocator.h"

#include "wtf/Noncopyable.h"

-#include <memory>

+#include "wtf/OwnPtr.h"

namespace blink {

@@ -63,7 +63,7 @@ protected:

IntSize implOnlyAnimationAdjustmentForTesting() { return m_implOnlyAnimationAdjustment; }

void resetAnimationIds();

- bool addAnimation(std::unique_ptr<CompositorAnimation>);

+ bool addAnimation(PassOwnPtr<CompositorAnimation>);

void removeAnimation();

virtual void abortAnimation();

@@ -139,7 +139,7 @@ protected:

RunningOnCompositorButNeedsAdjustment,

};

- std::unique_ptr<CompositorAnimationPlayer> m_compositorPlayer;

+ OwnPtr<CompositorAnimationPlayer> m_compositorPlayer;

int m_compositorAnimationAttachedToLayerId;

RunState m_runState;

int m_compositorAnimationId;