Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(392)

Unified Diff: cc/trees/layer_tree_host.cc

Issue 1680613002: Adding momentum/overscroll to views:: ScrollViews Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Tableview layout. aaaand I think we are done Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/draw_property_utils.cc ('k') | cc/trees/layer_tree_host_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
}
« no previous file with comments | « cc/trees/draw_property_utils.cc ('k') | cc/trees/layer_tree_host_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698