| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 CC_ANIMATION_ANIMATION_TIMELINE_H_ | 5 #ifndef CC_ANIMATION_ANIMATION_TIMELINE_H_ |
| 6 #define CC_ANIMATION_ANIMATION_TIMELINE_H_ | 6 #define CC_ANIMATION_ANIMATION_TIMELINE_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/containers/hash_tables.h" | |
| 11 #include "base/macros.h" | 10 #include "base/macros.h" |
| 12 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 13 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 14 #include "cc/base/cc_export.h" | 13 #include "cc/base/cc_export.h" |
| 15 | 14 |
| 16 namespace cc { | 15 namespace cc { |
| 17 | 16 |
| 18 class AnimationHost; | 17 class AnimationHost; |
| 19 class AnimationPlayer; | 18 class AnimationPlayer; |
| 20 | 19 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 // Impl-only AnimationTimeline has no main thread instance and lives on | 68 // Impl-only AnimationTimeline has no main thread instance and lives on |
| 70 // it's own. | 69 // it's own. |
| 71 bool is_impl_only_; | 70 bool is_impl_only_; |
| 72 | 71 |
| 73 DISALLOW_COPY_AND_ASSIGN(AnimationTimeline); | 72 DISALLOW_COPY_AND_ASSIGN(AnimationTimeline); |
| 74 }; | 73 }; |
| 75 | 74 |
| 76 } // namespace cc | 75 } // namespace cc |
| 77 | 76 |
| 78 #endif // CC_ANIMATION_ANIMATION_TIMELINE_H_ | 77 #endif // CC_ANIMATION_ANIMATION_TIMELINE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1587283002:
Switch cc to std::unordered_*. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@unordered-map