| 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 <list> | |
| 9 #include <set> | 8 #include <set> |
| 10 #include <string> | 9 #include <string> |
| 11 #include <vector> | 10 #include <vector> |
| 12 | 11 |
| 13 #include "base/containers/hash_tables.h" | 12 #include "base/containers/hash_tables.h" |
| 14 #include "base/values.h" | 13 #include "base/values.h" |
| 15 #include "cc/base/scoped_ptr_vector.h" | 14 #include "cc/base/scoped_ptr_vector.h" |
| 16 #include "cc/base/swap_promise.h" | 15 #include "cc/base/swap_promise.h" |
| 17 #include "cc/base/synced_property.h" | 16 #include "cc/base/synced_property.h" |
| 18 #include "cc/layers/layer_impl.h" | 17 #include "cc/layers/layer_impl.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 42 class PaintTimeCounter; | 41 class PaintTimeCounter; |
| 43 class PictureLayerImpl; | 42 class PictureLayerImpl; |
| 44 class Proxy; | 43 class Proxy; |
| 45 class ResourceProvider; | 44 class ResourceProvider; |
| 46 class TileManager; | 45 class TileManager; |
| 47 class UIResourceRequest; | 46 class UIResourceRequest; |
| 48 struct PendingPageScaleAnimation; | 47 struct PendingPageScaleAnimation; |
| 49 struct RendererCapabilities; | 48 struct RendererCapabilities; |
| 50 struct SelectionHandle; | 49 struct SelectionHandle; |
| 51 | 50 |
| 52 typedef std::list<UIResourceRequest> UIResourceRequestQueue; | 51 typedef std::vector<UIResourceRequest> UIResourceRequestQueue; |
| 53 typedef SyncedProperty<AdditionGroup<gfx::Vector2dF>> SyncedElasticOverscroll; | 52 typedef SyncedProperty<AdditionGroup<gfx::Vector2dF>> SyncedElasticOverscroll; |
| 54 | 53 |
| 55 class CC_EXPORT LayerTreeImpl { | 54 class CC_EXPORT LayerTreeImpl { |
| 56 public: | 55 public: |
| 57 static scoped_ptr<LayerTreeImpl> create( | 56 static scoped_ptr<LayerTreeImpl> create( |
| 58 LayerTreeHostImpl* layer_tree_host_impl, | 57 LayerTreeHostImpl* layer_tree_host_impl, |
| 59 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor, | 58 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor, |
| 60 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll) { | 59 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll) { |
| 61 return make_scoped_ptr(new LayerTreeImpl( | 60 return make_scoped_ptr(new LayerTreeImpl( |
| 62 layer_tree_host_impl, page_scale_factor, elastic_overscroll)); | 61 layer_tree_host_impl, page_scale_factor, elastic_overscroll)); |
| (...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 | 414 |
| 416 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; | 415 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; |
| 417 | 416 |
| 418 private: | 417 private: |
| 419 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); | 418 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); |
| 420 }; | 419 }; |
| 421 | 420 |
| 422 } // namespace cc | 421 } // namespace cc |
| 423 | 422 |
| 424 #endif // CC_TREES_LAYER_TREE_IMPL_H_ | 423 #endif // CC_TREES_LAYER_TREE_IMPL_H_ |
| OLD | NEW |