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

Unified Diff: ui/compositor/layer.cc

Issue 2194833002: Overscroll and Elasticity for views::ScrollView Base URL: https://chromium.googlesource.com/chromium/src.git@20160728-MacViews-RouteThroughInputHandler
Patch Set: Restore functionality and fix bugs \o/ Created 4 years, 1 month 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 | « ui/compositor/BUILD.gn ('k') | ui/compositor/overscroll/ui_input_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 43c770ba79670ae0d859fee477fad486c10d198b..f2fc139ddf7ecd1090ce2c3d627cae67f5a5f69c 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -832,7 +832,8 @@ void Layer::OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) {
void Layer::SetScrollable(Layer* parent_clip_layer,
const base::Closure& on_scroll) {
- cc_layer_->SetScrollClipLayerId(parent_clip_layer->cc_layer_->id());
+ cc_layer_->SetScrollClipAndCanOverscroll(parent_clip_layer->cc_layer_->id(),
+ true /* can_overscroll */);
cc_layer_->set_did_scroll_callback(on_scroll);
cc_layer_->SetUserScrollable(true, true);
}
« no previous file with comments | « ui/compositor/BUILD.gn ('k') | ui/compositor/overscroll/ui_input_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698