| OLD | NEW |
| 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 "cc/own_ptr_vector.h" |
| 10 #include <wtf/HashSet.h> | 11 #include <wtf/HashSet.h> |
| 11 #include <wtf/Noncopyable.h> | 12 #include <wtf/Noncopyable.h> |
| 12 #include <wtf/OwnPtr.h> | 13 #include <wtf/OwnPtr.h> |
| 13 #include <wtf/PassOwnPtr.h> | 14 #include <wtf/PassOwnPtr.h> |
| 14 #include <wtf/Vector.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; |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 void resolveConflicts(double monotonicTime); | 97 void resolveConflicts(double monotonicTime); |
| 98 void markAnimationsForDeletion(double monotonicTime, CCAnimationEventsVector
*); | 98 void markAnimationsForDeletion(double monotonicTime, CCAnimationEventsVector
*); |
| 99 void purgeAnimationsMarkedForDeletion(); | 99 void purgeAnimationsMarkedForDeletion(); |
| 100 | 100 |
| 101 void tickAnimations(double monotonicTime); | 101 void tickAnimations(double monotonicTime); |
| 102 | 102 |
| 103 // If this is true, we force a sync to the impl thread. | 103 // If this is true, we force a sync to the impl thread. |
| 104 bool m_forceSync; | 104 bool m_forceSync; |
| 105 | 105 |
| 106 CCLayerAnimationControllerClient* m_client; | 106 CCLayerAnimationControllerClient* m_client; |
| 107 Vector<OwnPtr<CCActiveAnimation> > m_activeAnimations; | 107 OwnPtrVector<CCActiveAnimation> m_activeAnimations; |
| 108 }; | 108 }; |
| 109 | 109 |
| 110 } // namespace cc | 110 } // namespace cc |
| 111 | 111 |
| 112 #endif // CCLayerAnimationController_h | 112 #endif // CCLayerAnimationController_h |
| OLD | NEW |