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

Index: third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.h

diff --git a/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.h b/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.h

index 9ca0bec701a10dd59e4c46de71fa0f640b63d14d..4510ff8bb45d0eb9fcacb3821cc6e6cbce5d4cc8 100644

--- a/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.h

+++ b/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.h

@@ -29,7 +29,8 @@

#include "platform/PlatformExport.h"

#include "wtf/Allocator.h"

#include "wtf/Noncopyable.h"

-#include <memory>

+#include "wtf/OwnPtr.h"

+#include "wtf/PassOwnPtr.h"

namespace blink {

@@ -44,19 +45,19 @@ class PLATFORM_EXPORT WebActiveGestureAnimation {

USING_FAST_MALLOC(WebActiveGestureAnimation);

WTF_MAKE_NONCOPYABLE(WebActiveGestureAnimation);

public:

- static std::unique_ptr<WebActiveGestureAnimation> createAtAnimationStart(std::unique_ptr<WebGestureCurve>, WebGestureCurveTarget*);

- static std::unique_ptr<WebActiveGestureAnimation> createWithTimeOffset(std::unique_ptr<WebGestureCurve>, WebGestureCurveTarget*, double startTime);

+ static PassOwnPtr<WebActiveGestureAnimation> createAtAnimationStart(PassOwnPtr<WebGestureCurve>, WebGestureCurveTarget*);

+ static PassOwnPtr<WebActiveGestureAnimation> createWithTimeOffset(PassOwnPtr<WebGestureCurve>, WebGestureCurveTarget*, double startTime);

~WebActiveGestureAnimation();

bool animate(double time);

private:

// Assumes a valid WebGestureCurveTarget that outlives the animation.

- WebActiveGestureAnimation(std::unique_ptr<WebGestureCurve>, WebGestureCurveTarget*, double startTime, bool waitingForFirstTick);

+ WebActiveGestureAnimation(PassOwnPtr<WebGestureCurve>, WebGestureCurveTarget*, double startTime, bool waitingForFirstTick);

double m_startTime;

bool m_waitingForFirstTick;

- std::unique_ptr<WebGestureCurve> m_curve;

+ OwnPtr<WebGestureCurve> m_curve;

WebGestureCurveTarget* m_target;

};