| 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());
|
| }
|
| }
|
|
|
|
|