Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Side by Side Diff: third_party/WebKit/Source/platform/animation/CompositorAnimationTimeline.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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CompositorAnimationTimeline_h 5 #ifndef CompositorAnimationTimeline_h
6 #define CompositorAnimationTimeline_h 6 #define CompositorAnimationTimeline_h
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "cc/animation/animation_timeline.h" 9 #include "cc/animation/animation_timeline.h"
10 #include "platform/PlatformExport.h" 10 #include "platform/PlatformExport.h"
11 #include "wtf/Noncopyable.h" 11 #include "wtf/Noncopyable.h"
12 #include "wtf/PtrUtil.h" 12 #include "wtf/PassOwnPtr.h"
13
13 #include <memory> 14 #include <memory>
14 15
15 namespace blink { 16 namespace blink {
16 17
17 class CompositorAnimationHost; 18 class CompositorAnimationHost;
18 class CompositorAnimationPlayerClient; 19 class CompositorAnimationPlayerClient;
19 20
20 // A compositor representation for cc::AnimationTimeline. 21 // A compositor representation for cc::AnimationTimeline.
21 class PLATFORM_EXPORT CompositorAnimationTimeline { 22 class PLATFORM_EXPORT CompositorAnimationTimeline {
22 WTF_MAKE_NONCOPYABLE(CompositorAnimationTimeline); 23 WTF_MAKE_NONCOPYABLE(CompositorAnimationTimeline);
23 public: 24 public:
24 static std::unique_ptr<CompositorAnimationTimeline> create() 25 static PassOwnPtr<CompositorAnimationTimeline> create()
25 { 26 {
26 return wrapUnique(new CompositorAnimationTimeline()); 27 return adoptPtr(new CompositorAnimationTimeline());
27 } 28 }
28 29
29 ~CompositorAnimationTimeline(); 30 ~CompositorAnimationTimeline();
30 31
31 cc::AnimationTimeline* animationTimeline() const; 32 cc::AnimationTimeline* animationTimeline() const;
32 // TODO(ymalik): Currently we just wrap cc::AnimationHost in 33 // TODO(ymalik): Currently we just wrap cc::AnimationHost in
33 // CompositorAnimationHost. Correctly introduce CompositorAnimationHost 34 // CompositorAnimationHost. Correctly introduce CompositorAnimationHost
34 // to blink. See crbug.com/610763. 35 // to blink. See crbug.com/610763.
35 CompositorAnimationHost compositorAnimationHost(); 36 CompositorAnimationHost compositorAnimationHost();
36 37
37 void playerAttached(const CompositorAnimationPlayerClient&); 38 void playerAttached(const CompositorAnimationPlayerClient&);
38 void playerDestroyed(const CompositorAnimationPlayerClient&); 39 void playerDestroyed(const CompositorAnimationPlayerClient&);
39 40
40 private: 41 private:
41 CompositorAnimationTimeline(); 42 CompositorAnimationTimeline();
42 43
43 scoped_refptr<cc::AnimationTimeline> m_animationTimeline; 44 scoped_refptr<cc::AnimationTimeline> m_animationTimeline;
44 }; 45 };
45 46
46 } // namespace blink 47 } // namespace blink
47 48
48 #endif // CompositorAnimationTimeline_h 49 #endif // CompositorAnimationTimeline_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698