| Index: cc/trees/layer_tree_host_common.h
|
| diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h
|
| index 404f407f008f9fdcc00bde62d643d40ca09b8beb..030d07a8adc1852aec32c692f37d7823b9d5245e 100644
|
| --- a/cc/trees/layer_tree_host_common.h
|
| +++ b/cc/trees/layer_tree_host_common.h
|
| @@ -13,6 +13,7 @@
|
| #include "cc/base/cc_export.h"
|
| #include "cc/base/scoped_ptr_vector.h"
|
| #include "cc/layers/layer_lists.h"
|
| +#include "cc/trees/property_tree.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| #include "ui/gfx/geometry/vector2d.h"
|
| #include "ui/gfx/transform.h"
|
| @@ -22,6 +23,7 @@ namespace cc {
|
| class LayerImpl;
|
| class Layer;
|
| class SwapPromise;
|
| +class PropertyTrees;
|
|
|
| class CC_EXPORT LayerTreeHostCommon {
|
| public:
|
| @@ -47,7 +49,8 @@ class CC_EXPORT LayerTreeHostCommon {
|
| bool can_adjust_raster_scales,
|
| bool verify_property_trees,
|
| RenderSurfaceLayerListType* render_surface_layer_list,
|
| - int current_render_surface_layer_list_id)
|
| + int current_render_surface_layer_list_id,
|
| + PropertyTrees* property_trees)
|
| : root_layer(root_layer),
|
| device_viewport_size(device_viewport_size),
|
| device_transform(device_transform),
|
| @@ -65,7 +68,8 @@ class CC_EXPORT LayerTreeHostCommon {
|
| verify_property_trees(verify_property_trees),
|
| render_surface_layer_list(render_surface_layer_list),
|
| current_render_surface_layer_list_id(
|
| - current_render_surface_layer_list_id) {}
|
| + current_render_surface_layer_list_id),
|
| + property_trees(property_trees) {}
|
|
|
| LayerType* root_layer;
|
| gfx::Size device_viewport_size;
|
| @@ -83,6 +87,7 @@ class CC_EXPORT LayerTreeHostCommon {
|
| bool verify_property_trees;
|
| RenderSurfaceLayerListType* render_surface_layer_list;
|
| int current_render_surface_layer_list_id;
|
| + PropertyTrees* property_trees;
|
| };
|
|
|
| template <typename LayerType, typename RenderSurfaceLayerListType>
|
| @@ -100,6 +105,7 @@ class CC_EXPORT LayerTreeHostCommon {
|
|
|
| private:
|
| const gfx::Transform identity_transform_;
|
| + PropertyTrees property_trees;
|
| };
|
|
|
| typedef CalcDrawPropsInputs<Layer, RenderSurfaceLayerList>
|
| @@ -251,7 +257,8 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
|
| false,
|
| true,
|
| render_surface_layer_list,
|
| - 0) {
|
| + 0,
|
| + &property_trees) {
|
| DCHECK(root_layer);
|
| DCHECK(render_surface_layer_list);
|
| }
|
| @@ -279,7 +286,8 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
|
| false,
|
| true,
|
| render_surface_layer_list,
|
| - 0) {
|
| + 0,
|
| + &property_trees) {
|
| DCHECK(root_layer);
|
| DCHECK(render_surface_layer_list);
|
| }
|
|
|