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

Side by Side Diff: cc/CCLayerAnimationController.h

Issue 10985088: cc: Switch it to use DISALLOW_COPY_AND_ASSIGN macro from base/ library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « cc/CCInputHandler.h ('k') | cc/CCLayerSorter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 CCLayerAnimationController_h 5 #ifndef CCLayerAnimationController_h
6 #define CCLayerAnimationController_h 6 #define CCLayerAnimationController_h
7 7
8 #include "CCAnimationEvents.h" 8 #include "CCAnimationEvents.h"
9 9
10 #include "base/basictypes.h"
10 #include "cc/own_ptr_vector.h" 11 #include "cc/own_ptr_vector.h"
11 #include <wtf/HashSet.h> 12 #include <wtf/HashSet.h>
12 #include <wtf/Noncopyable.h>
13 #include <wtf/OwnPtr.h> 13 #include <wtf/OwnPtr.h>
14 #include <wtf/PassOwnPtr.h> 14 #include <wtf/PassOwnPtr.h>
15 15
16 namespace WebKit { 16 namespace WebKit {
17 class WebTransformationMatrix; 17 class WebTransformationMatrix;
18 } 18 }
19 19
20 namespace cc { 20 namespace cc {
21 21
22 class Animation; 22 class Animation;
23 class IntSize; 23 class IntSize;
24 class KeyframeValueList; 24 class KeyframeValueList;
25 25
26 class CCLayerAnimationControllerClient { 26 class CCLayerAnimationControllerClient {
27 public: 27 public:
28 virtual ~CCLayerAnimationControllerClient() { } 28 virtual ~CCLayerAnimationControllerClient() { }
29 29
30 virtual int id() const = 0; 30 virtual int id() const = 0;
31 virtual void setOpacityFromAnimation(float) = 0; 31 virtual void setOpacityFromAnimation(float) = 0;
32 virtual float opacity() const = 0; 32 virtual float opacity() const = 0;
33 virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix &) = 0; 33 virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix &) = 0;
34 virtual const WebKit::WebTransformationMatrix& transform() const = 0; 34 virtual const WebKit::WebTransformationMatrix& transform() const = 0;
35 }; 35 };
36 36
37 class CCLayerAnimationController { 37 class CCLayerAnimationController {
38 WTF_MAKE_NONCOPYABLE(CCLayerAnimationController);
39 public: 38 public:
40 static PassOwnPtr<CCLayerAnimationController> create(CCLayerAnimationControl lerClient*); 39 static PassOwnPtr<CCLayerAnimationController> create(CCLayerAnimationControl lerClient*);
41 40
42 virtual ~CCLayerAnimationController(); 41 virtual ~CCLayerAnimationController();
43 42
44 // These methods are virtual for testing. 43 // These methods are virtual for testing.
45 virtual void addAnimation(PassOwnPtr<CCActiveAnimation>); 44 virtual void addAnimation(PassOwnPtr<CCActiveAnimation>);
46 virtual void pauseAnimation(int animationId, double timeOffset); 45 virtual void pauseAnimation(int animationId, double timeOffset);
47 virtual void removeAnimation(int animationId); 46 virtual void removeAnimation(int animationId);
48 virtual void removeAnimation(int animationId, CCActiveAnimation::TargetPrope rty); 47 virtual void removeAnimation(int animationId, CCActiveAnimation::TargetPrope rty);
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 void markAnimationsForDeletion(double monotonicTime, CCAnimationEventsVector *); 97 void markAnimationsForDeletion(double monotonicTime, CCAnimationEventsVector *);
99 void purgeAnimationsMarkedForDeletion(); 98 void purgeAnimationsMarkedForDeletion();
100 99
101 void tickAnimations(double monotonicTime); 100 void tickAnimations(double monotonicTime);
102 101
103 // If this is true, we force a sync to the impl thread. 102 // If this is true, we force a sync to the impl thread.
104 bool m_forceSync; 103 bool m_forceSync;
105 104
106 CCLayerAnimationControllerClient* m_client; 105 CCLayerAnimationControllerClient* m_client;
107 OwnPtrVector<CCActiveAnimation> m_activeAnimations; 106 OwnPtrVector<CCActiveAnimation> m_activeAnimations;
107
108 DISALLOW_COPY_AND_ASSIGN(CCLayerAnimationController);
108 }; 109 };
109 110
110 } // namespace cc 111 } // namespace cc
111 112
112 #endif // CCLayerAnimationController_h 113 #endif // CCLayerAnimationController_h
OLDNEW
« no previous file with comments | « cc/CCInputHandler.h ('k') | cc/CCLayerSorter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698