| Index: cc/layers/layer.cc
|
| diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
|
| index 7362df6c5cc3fbacd5acb720e65ce686d0a7d7ee..f7ce45f8e288f5a033c44ad68b56c98dbb461ca9 100644
|
| --- a/cc/layers/layer.cc
|
| +++ b/cc/layers/layer.cc
|
| @@ -87,6 +87,7 @@ Layer::Layer()
|
| transform_tree_index_(TransformTree::kInvalidNodeId),
|
| effect_tree_index_(EffectTree::kInvalidNodeId),
|
| clip_tree_index_(ClipTree::kInvalidNodeId),
|
| + new_clip_tree_index_(ClipTree::kInvalidNodeId),
|
| scroll_tree_index_(ScrollTree::kInvalidNodeId),
|
| property_tree_sequence_number_(-1),
|
| should_flatten_transform_from_property_tree_(false),
|
| @@ -957,6 +958,17 @@ int Layer::clip_tree_index() const {
|
| return clip_tree_index_;
|
| }
|
|
|
| +void Layer::SetNewClipTreeIndex(int index) {
|
| + if (new_clip_tree_index_ == index)
|
| + return;
|
| + new_clip_tree_index_ = index;
|
| + SetNeedsPushProperties();
|
| +}
|
| +
|
| +int Layer::new_clip_tree_index() const {
|
| + return new_clip_tree_index_;
|
| +}
|
| +
|
| void Layer::SetEffectTreeIndex(int index) {
|
| DCHECK(IsPropertyChangeAllowed());
|
| if (effect_tree_index_ == index)
|
| @@ -1143,6 +1155,7 @@ void Layer::PushPropertiesTo(LayerImpl* layer) {
|
| layer->SetTransformTreeIndex(transform_tree_index());
|
| layer->SetEffectTreeIndex(effect_tree_index());
|
| layer->SetClipTreeIndex(clip_tree_index());
|
| + layer->SetNewClipTreeIndex(new_clip_tree_index());
|
| layer->SetScrollTreeIndex(scroll_tree_index());
|
| layer->set_offset_to_transform_parent(offset_to_transform_parent_);
|
| layer->SetDrawsContent(DrawsContent());
|
|
|