| Index: cc/layers/layer_impl.cc
|
| diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
|
| index f585bde06ceebf656f8f514cbdffd8437104a6ab..6f3b56bec0092b35900863680f20c2cfa815796e 100644
|
| --- a/cc/layers/layer_impl.cc
|
| +++ b/cc/layers/layer_impl.cc
|
| @@ -88,6 +88,7 @@ LayerImpl::LayerImpl(LayerTreeImpl* tree_impl,
|
| transform_tree_index_(-1),
|
| effect_tree_index_(-1),
|
| clip_tree_index_(-1),
|
| + scroll_tree_index_(-1),
|
| draw_depth_(0.f),
|
| needs_push_properties_(false),
|
| num_dependents_need_push_properties_(0),
|
| @@ -277,6 +278,11 @@ void LayerImpl::SetEffectTreeIndex(int index) {
|
| SetNeedsPushProperties();
|
| }
|
|
|
| +void LayerImpl::SetScrollTreeIndex(int index) {
|
| + scroll_tree_index_ = index;
|
| + SetNeedsPushProperties();
|
| +}
|
| +
|
| void LayerImpl::PassCopyRequests(
|
| std::vector<scoped_ptr<CopyOutputRequest>>* requests) {
|
| // In the case that a layer still has a copy request, this means that there's
|
| @@ -657,6 +663,7 @@ void LayerImpl::PushPropertiesTo(LayerImpl* layer) {
|
| layer->SetTransformTreeIndex(transform_tree_index_);
|
| layer->SetClipTreeIndex(clip_tree_index_);
|
| layer->SetEffectTreeIndex(effect_tree_index_);
|
| + layer->SetScrollTreeIndex(scroll_tree_index_);
|
| layer->set_offset_to_transform_parent(offset_to_transform_parent_);
|
|
|
| LayerImpl* scroll_parent = nullptr;
|
|
|