| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index ab3e02065af58a317a0e4edd1cbac8d2dc5fbc52..f05d877f6c945e07c9dc0e5ea27b370d989adf87 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -3267,17 +3267,9 @@ static void CollectScrollDeltas(ScrollAndScaleSet* scroll_info,
|
| if (!layer_impl)
|
| return;
|
|
|
| - gfx::ScrollOffset scroll_delta = layer_impl->PullDeltaForMainThread();
|
| -
|
| - if (!scroll_delta.IsZero()) {
|
| - LayerTreeHostCommon::ScrollUpdateInfo scroll;
|
| - scroll.layer_id = layer_impl->id();
|
| - scroll.scroll_delta = gfx::Vector2d(scroll_delta.x(), scroll_delta.y());
|
| - scroll_info->scrolls.push_back(scroll);
|
| - }
|
| -
|
| - for (size_t i = 0; i < layer_impl->children().size(); ++i)
|
| - CollectScrollDeltas(scroll_info, layer_impl->children()[i].get());
|
| + return layer_impl->layer_tree_impl()
|
| + ->property_trees()
|
| + ->scroll_tree.CollectScrollDeltas(scroll_info);
|
| }
|
|
|
| scoped_ptr<ScrollAndScaleSet> LayerTreeHostImpl::ProcessScrollDeltas() {
|
|
|