| 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 CC_TREES_LAYER_TREE_IMPL_H_ | 5 #ifndef CC_TREES_LAYER_TREE_IMPL_H_ |
| 6 #define CC_TREES_LAYER_TREE_IMPL_H_ | 6 #define CC_TREES_LAYER_TREE_IMPL_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/containers/hash_tables.h" | 12 #include "base/containers/hash_tables.h" |
| 13 #include "base/values.h" | 13 #include "base/values.h" |
| 14 #include "cc/base/scoped_ptr_vector.h" | 14 #include "cc/base/scoped_ptr_vector.h" |
| 15 #include "cc/base/swap_promise.h" | 15 #include "cc/base/swap_promise.h" |
| 16 #include "cc/base/synced_property.h" | 16 #include "cc/base/synced_property.h" |
| 17 #include "cc/layers/layer_impl.h" | 17 #include "cc/layers/layer_impl.h" |
| 18 #include "cc/output/renderer.h" | 18 #include "cc/output/renderer.h" |
| 19 #include "cc/resources/ui_resource_client.h" | 19 #include "cc/resources/ui_resource_client.h" |
| 20 | 20 |
| 21 namespace base { | 21 namespace base { |
| 22 namespace debug { | 22 namespace trace_event { |
| 23 class TracedValue; | 23 class TracedValue; |
| 24 } | 24 } |
| 25 |
| 26 // TODO(ssid): remove these aliases after the tracing clients are moved to the |
| 27 // new trace_event namespace. See crbug.com/451032. ETA: March 2015 |
| 28 namespace debug { |
| 29 using ::base::trace_event::TracedValue; |
| 25 } | 30 } |
| 31 } // namespace base |
| 26 | 32 |
| 27 namespace cc { | 33 namespace cc { |
| 28 | 34 |
| 29 class ContextProvider; | 35 class ContextProvider; |
| 30 class DebugRectHistory; | 36 class DebugRectHistory; |
| 31 class FrameRateCounter; | 37 class FrameRateCounter; |
| 32 class HeadsUpDisplayLayerImpl; | 38 class HeadsUpDisplayLayerImpl; |
| 33 class LayerScrollOffsetDelegateProxy; | 39 class LayerScrollOffsetDelegateProxy; |
| 34 class LayerTreeDebugState; | 40 class LayerTreeDebugState; |
| 35 class LayerTreeHostImpl; | 41 class LayerTreeHostImpl; |
| (...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 | 422 |
| 417 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; | 423 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; |
| 418 | 424 |
| 419 private: | 425 private: |
| 420 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); | 426 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); |
| 421 }; | 427 }; |
| 422 | 428 |
| 423 } // namespace cc | 429 } // namespace cc |
| 424 | 430 |
| 425 #endif // CC_TREES_LAYER_TREE_IMPL_H_ | 431 #endif // CC_TREES_LAYER_TREE_IMPL_H_ |
| OLD | NEW |