| Index: cc/trees/layer_tree_host.cc
|
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
|
| index f295efcfaca6ea2c8cdaf8b5fbe7946151a5bcca..d2dfe1d4dbfaa7c2b3073d8e1ced65ed0916257e 100644
|
| --- a/cc/trees/layer_tree_host.cc
|
| +++ b/cc/trees/layer_tree_host.cc
|
| @@ -1086,7 +1086,8 @@ void LayerTreeHost::ApplyViewportDeltas(ScrollAndScaleSet* info) {
|
| inner_viewport_scroll_layer_->SetScrollOffsetFromImplSide(
|
| gfx::ScrollOffsetWithDelta(
|
| inner_viewport_scroll_layer_->scroll_offset(),
|
| - inner_viewport_scroll_delta));
|
| + inner_viewport_scroll_delta),
|
| + nullptr);
|
| }
|
|
|
| ApplyPageScaleDeltaFromImplSide(info->page_scale_delta);
|
| @@ -1115,8 +1116,11 @@ void LayerTreeHost::ApplyScrollAndScale(ScrollAndScaleSet* info) {
|
| Layer* layer = LayerById(info->scrolls[i].layer_id);
|
| if (!layer)
|
| continue;
|
| - layer->SetScrollOffsetFromImplSide(gfx::ScrollOffsetWithDelta(
|
| - layer->scroll_offset(), info->scrolls[i].scroll_delta));
|
| +
|
| + layer->SetScrollOffsetFromImplSide(
|
| + gfx::ScrollOffsetWithDelta(layer->scroll_offset(),
|
| + info->scrolls[i].scroll_delta),
|
| + &info->elastic_overscroll_delta);
|
| SetNeedsUpdateLayers();
|
| }
|
| }
|
|
|