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

Unified Diff: ui/events/blink/input_handler_proxy.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/overscroll/ui_input_handler.cc ('k') | ui/events/blink/input_handler_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/blink/input_handler_proxy.cc
diff --git a/ui/events/blink/input_handler_proxy.cc b/ui/events/blink/input_handler_proxy.cc
index 01d2544ceebb997e47f6822a2eea07fb510480f0..8f2aaf91d73b961bf8e697f5bc9bf8f7788d2dba 100644
--- a/ui/events/blink/input_handler_proxy.cc
+++ b/ui/events/blink/input_handler_proxy.cc
@@ -252,10 +252,11 @@ InputHandlerProxy::InputHandlerProxy(cc::InputHandler* input_handler,
DCHECK(client);
input_handler_->BindToClient(this);
cc::ScrollElasticityHelper* scroll_elasticity_helper =
- input_handler_->CreateScrollElasticityHelper();
+ input_handler_->CreateRootScrollElasticityHelper();
if (scroll_elasticity_helper) {
- scroll_elasticity_controller_.reset(
- new InputScrollElasticityController(scroll_elasticity_helper));
+ scroll_elasticity_controller_.reset(new InputScrollElasticityController());
+ scroll_elasticity_controller_->SetActiveHelper(
+ scroll_elasticity_helper->GetWeakPtr());
}
}
« no previous file with comments | « ui/compositor/overscroll/ui_input_handler.cc ('k') | ui/events/blink/input_handler_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698