Chromium Code Reviews| Index: content/renderer/input/input_handler_wrapper.cc |
| diff --git a/content/renderer/input/input_handler_wrapper.cc b/content/renderer/input/input_handler_wrapper.cc |
| index e53f624a83138c9620c0c1dbdbce37da805063d2..00387d11f1c2f7dc9b0d9ac54fc30d2fa946432e 100644 |
| --- a/content/renderer/input/input_handler_wrapper.cc |
| +++ b/content/renderer/input/input_handler_wrapper.cc |
| @@ -7,6 +7,7 @@ |
| #include "base/message_loop/message_loop_proxy.h" |
| #include "content/renderer/input/input_event_filter.h" |
| #include "content/renderer/input/input_handler_manager.h" |
| +#include "content/renderer/scheduler/renderer_scheduler.h" |
| #include "third_party/WebKit/public/platform/Platform.h" |
| namespace content { |
| @@ -16,12 +17,14 @@ InputHandlerWrapper::InputHandlerWrapper( |
| int routing_id, |
| const scoped_refptr<base::MessageLoopProxy>& main_loop, |
| const base::WeakPtr<cc::InputHandler>& input_handler, |
| - const base::WeakPtr<RenderViewImpl>& render_view_impl) |
| + const base::WeakPtr<RenderViewImpl>& render_view_impl, |
| + RendererScheduler* renderer_scheduler) |
| : input_handler_manager_(input_handler_manager), |
| routing_id_(routing_id), |
| input_handler_proxy_(input_handler.get(), this), |
| main_loop_(main_loop), |
| - render_view_impl_(render_view_impl) { |
| + render_view_impl_(render_view_impl), |
| + renderer_scheduler_(renderer_scheduler) { |
| DCHECK(input_handler); |
| } |
| @@ -58,7 +61,15 @@ void InputHandlerWrapper::DidStopFlinging() { |
| } |
| void InputHandlerWrapper::DidReceiveInputEvent() { |
| - // TODO(skyostil): Hook this up into the renderer scheduler. |
| + if (renderer_scheduler_) { |
|
Sami
2014/11/06 00:31:20
Instead of having renderer_scheduler_ as a member
alex clarke (OOO till 29th)
2014/11/06 19:21:45
Done.
|
| + renderer_scheduler_->DidReceiveInputEvent(); |
| + } |
| +} |
| + |
| +void InputHandlerWrapper::DidAnimate() { |
| + if (renderer_scheduler_) { |
|
Sami
2014/11/06 00:31:20
The scheduler should never be null, right?
alex clarke (OOO till 29th)
2014/11/06 19:21:45
Acknowledged.
|
| + renderer_scheduler_->DidAnimate(); |
| + } |
| } |
| } // namespace content |