| Index: cc/trees/layer_tree_host_in_process.cc
|
| diff --git a/cc/trees/layer_tree_host_in_process.cc b/cc/trees/layer_tree_host_in_process.cc
|
| index 3194ca85d50e3fc3256b19632c8f7e1c33a37938..f75639f52b3fb5360e9700c94fc55ce8eab179e2 100644
|
| --- a/cc/trees/layer_tree_host_in_process.cc
|
| +++ b/cc/trees/layer_tree_host_in_process.cc
|
| @@ -840,7 +840,8 @@ void LayerTreeHostInProcess::ApplyViewportDeltas(ScrollAndScaleSet* info) {
|
| layer_tree_->inner_viewport_scroll_layer()->SetScrollOffsetFromImplSide(
|
| gfx::ScrollOffsetWithDelta(
|
| layer_tree_->inner_viewport_scroll_layer()->scroll_offset(),
|
| - inner_viewport_scroll_delta));
|
| + inner_viewport_scroll_delta),
|
| + nullptr);
|
| }
|
|
|
| ApplyPageScaleDeltaFromImplSide(info->page_scale_delta);
|
| @@ -869,8 +870,10 @@ void LayerTreeHostInProcess::ApplyScrollAndScale(ScrollAndScaleSet* info) {
|
| Layer* layer = layer_tree_->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();
|
| }
|
| }
|
|
|