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

Side by Side Diff: third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. 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 CompositorAnimationPlayer_h 5 #ifndef CompositorAnimationPlayer_h
6 #define CompositorAnimationPlayer_h 6 #define CompositorAnimationPlayer_h
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "cc/animation/animation.h" 9 #include "cc/animation/animation.h"
10 #include "cc/animation/animation_curve.h" 10 #include "cc/animation/animation_curve.h"
11 #include "cc/animation/animation_delegate.h" 11 #include "cc/animation/animation_delegate.h"
12 #include "cc/animation/animation_player.h" 12 #include "cc/animation/animation_player.h"
13 #include "platform/PlatformExport.h" 13 #include "platform/PlatformExport.h"
14 #include "wtf/Noncopyable.h" 14 #include "wtf/Noncopyable.h"
15 #include "wtf/PassOwnPtr.h" 15 #include "wtf/PtrUtil.h"
16
17 #include <memory> 16 #include <memory>
18 17
19 namespace blink { 18 namespace blink {
20 19
21 class CompositorAnimation; 20 class CompositorAnimation;
22 class CompositorAnimationDelegate; 21 class CompositorAnimationDelegate;
23 class WebLayer; 22 class WebLayer;
24 23
25 // A compositor representation for AnimationPlayer. 24 // A compositor representation for AnimationPlayer.
26 class PLATFORM_EXPORT CompositorAnimationPlayer : public cc::AnimationDelegate { 25 class PLATFORM_EXPORT CompositorAnimationPlayer : public cc::AnimationDelegate {
27 WTF_MAKE_NONCOPYABLE(CompositorAnimationPlayer); 26 WTF_MAKE_NONCOPYABLE(CompositorAnimationPlayer);
28 public: 27 public:
29 static PassOwnPtr<CompositorAnimationPlayer> create() 28 static std::unique_ptr<CompositorAnimationPlayer> create()
30 { 29 {
31 return adoptPtr(new CompositorAnimationPlayer()); 30 return wrapUnique(new CompositorAnimationPlayer());
32 } 31 }
33 32
34 ~CompositorAnimationPlayer(); 33 ~CompositorAnimationPlayer();
35 34
36 cc::AnimationPlayer* animationPlayer() const; 35 cc::AnimationPlayer* animationPlayer() const;
37 36
38 // An animation delegate is notified when animations are started and 37 // An animation delegate is notified when animations are started and
39 // stopped. The CompositorAnimationPlayer does not take ownership of the del egate, and it is 38 // stopped. The CompositorAnimationPlayer does not take ownership of the del egate, and it is
40 // the responsibility of the client to reset the layer's delegate before 39 // the responsibility of the client to reset the layer's delegate before
41 // deleting the delegate. 40 // deleting the delegate.
(...skipping 17 matching lines...) Expand all
59 void NotifyAnimationAborted(base::TimeTicks monotonicTime, cc::TargetPropert y::Type, int group) override; 58 void NotifyAnimationAborted(base::TimeTicks monotonicTime, cc::TargetPropert y::Type, int group) override;
60 void NotifyAnimationTakeover(base::TimeTicks monotonicTime, cc::TargetProper ty::Type, double animationStartTime, std::unique_ptr<cc::AnimationCurve>) overri de; 59 void NotifyAnimationTakeover(base::TimeTicks monotonicTime, cc::TargetProper ty::Type, double animationStartTime, std::unique_ptr<cc::AnimationCurve>) overri de;
61 60
62 scoped_refptr<cc::AnimationPlayer> m_animationPlayer; 61 scoped_refptr<cc::AnimationPlayer> m_animationPlayer;
63 CompositorAnimationDelegate* m_delegate; 62 CompositorAnimationDelegate* m_delegate;
64 }; 63 };
65 64
66 } // namespace blink 65 } // namespace blink
67 66
68 #endif // CompositorAnimationPlayer_h 67 #endif // CompositorAnimationPlayer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698