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

Unified Diff: ui/events/blink/input_handler_proxy.cc

Issue 2189583004: [not for review - epic CL] Adding Elastic+Momentum+Layered scrolling to views::ScrollView Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 2 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
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 81b1d09911abf69a624d484dda6ed4121f5aea52..7cd76d3623c4b3df5d99518045ca3fab02e1a3a0 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_scroll_input_manager.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