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

Unified Diff: content/renderer/input/input_handler_manager.cc

Issue 692483002: Hook up DidReceiveInputEvent to the blink scheduler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Trying to fix diff base Created 6 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
Index: content/renderer/input/input_handler_manager.cc
diff --git a/content/renderer/input/input_handler_manager.cc b/content/renderer/input/input_handler_manager.cc
index a5433de2a302265f09b78d569b5825c49060f79b..ffcbb6b91107a8aff41252b3c194327eb35756f0 100644
--- a/content/renderer/input/input_handler_manager.cc
+++ b/content/renderer/input/input_handler_manager.cc
@@ -51,12 +51,14 @@ InputHandlerManager::~InputHandlerManager() {
void InputHandlerManager::AddInputHandler(
int routing_id,
const base::WeakPtr<cc::InputHandler>& input_handler,
- const base::WeakPtr<RenderViewImpl>& render_view_impl) {
+ const base::WeakPtr<RenderViewImpl>& render_view_impl,
+ RendererScheduler* renderer_scheduler) {
if (message_loop_proxy_->BelongsToCurrentThread()) {
AddInputHandlerOnCompositorThread(routing_id,
base::MessageLoopProxy::current(),
input_handler,
- render_view_impl);
+ render_view_impl,
+ renderer_scheduler);
} else {
message_loop_proxy_->PostTask(
FROM_HERE,
@@ -65,7 +67,8 @@ void InputHandlerManager::AddInputHandler(
routing_id,
base::MessageLoopProxy::current(),
input_handler,
- render_view_impl));
+ render_view_impl,
+ renderer_scheduler));
Sami 2014/11/06 00:31:20 This should probably be base::Unretained(renderer_
alex clarke (OOO till 29th) 2014/11/06 19:21:45 Acknowledged.
}
}
@@ -73,7 +76,8 @@ void InputHandlerManager::AddInputHandlerOnCompositorThread(
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) {
DCHECK(message_loop_proxy_->BelongsToCurrentThread());
// The handler could be gone by this point if the compositor has shut down.
@@ -88,9 +92,14 @@ void InputHandlerManager::AddInputHandlerOnCompositorThread(
"InputHandlerManager::AddInputHandlerOnCompositorThread",
"result", "AddingRoute");
client_->DidAddInputHandler(routing_id, input_handler.get());
- input_handlers_.add(routing_id,
+ input_handlers_.add(
+ routing_id,
make_scoped_ptr(new InputHandlerWrapper(this,
- routing_id, main_loop, input_handler, render_view_impl)));
+ routing_id,
+ main_loop,
+ input_handler,
+ render_view_impl,
+ renderer_scheduler)));
}
void InputHandlerManager::RemoveInputHandler(int routing_id) {

Powered by Google App Engine
This is Rietveld 408576698