| Index: cc/trees/layer_tree_impl.h
|
| diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
|
| index f9f1ba1d39c3b7fb6c4216128f53f75de759aa71..a8942fc9ec4a686ba24069ad737dda9f213d149a 100644
|
| --- a/cc/trees/layer_tree_impl.h
|
| +++ b/cc/trees/layer_tree_impl.h
|
| @@ -129,8 +129,10 @@ class CC_EXPORT LayerTreeImpl {
|
| void SetRootLayer(scoped_ptr<LayerImpl>);
|
| scoped_ptr<LayerImpl> DetachLayerTree();
|
|
|
| - void SetPropertyTrees(const PropertyTrees& property_trees) {
|
| + void SetPropertyTrees(const PropertyTrees property_trees) {
|
| property_trees_ = property_trees;
|
| + property_trees_.is_main_thread = false;
|
| + property_trees_.is_active = IsActiveTree();
|
| property_trees_.transform_tree.set_source_to_parent_updates_allowed(false);
|
| }
|
| PropertyTrees* property_trees() { return &property_trees_; }
|
| @@ -205,6 +207,10 @@ class CC_EXPORT LayerTreeImpl {
|
| }
|
|
|
| void UpdatePropertyTreeScrollingAndAnimationFromMainThread();
|
| + void UpdatePropertyTreeScrollOffset(PropertyTrees* property_trees) {
|
| + property_trees_.scroll_tree.UpdateScrollOffsetMap(
|
| + &property_trees->scroll_tree.scroll_offset_map(), this);
|
| + }
|
| void SetPageScaleOnActiveTree(float active_page_scale);
|
| void PushPageScaleFromMainThread(float page_scale_factor,
|
| float min_page_scale_factor,
|
|
|