| Index: cc/trees/layer_tree_impl.h
|
| diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
|
| index 9d9739042a33acf43c5158876a95f1c439a59647..d51c0426298db1c3994150c6d85365e0747f7cb5 100644
|
| --- a/cc/trees/layer_tree_impl.h
|
| +++ b/cc/trees/layer_tree_impl.h
|
| @@ -20,6 +20,7 @@
|
| #include "cc/output/swap_promise.h"
|
| #include "cc/resources/ui_resource_client.h"
|
| #include "cc/trees/layer_tree_host_impl.h"
|
| +#include "cc/trees/property_tree.h"
|
|
|
| namespace base {
|
| namespace trace_event {
|
| @@ -129,6 +130,10 @@ class CC_EXPORT LayerTreeImpl {
|
| void SetRootLayer(scoped_ptr<LayerImpl>);
|
| scoped_ptr<LayerImpl> DetachLayerTree();
|
|
|
| + void SetPropertyTrees(const PropertyTrees& property_trees) {
|
| + property_trees_ = property_trees;
|
| + }
|
| +
|
| void PushPropertiesTo(LayerTreeImpl* tree_impl);
|
|
|
| int source_frame_number() const { return source_frame_number_; }
|
| @@ -360,6 +365,7 @@ class CC_EXPORT LayerTreeImpl {
|
| int source_frame_number_;
|
| scoped_ptr<LayerImpl> root_layer_;
|
| HeadsUpDisplayLayerImpl* hud_layer_;
|
| + PropertyTrees property_trees_;
|
| LayerImpl* currently_scrolling_layer_;
|
| LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate_;
|
| SkColor background_color_;
|
|
|