Index: content/renderer/input/input_event_filter.cc |
diff --git a/content/renderer/input/input_event_filter.cc b/content/renderer/input/input_event_filter.cc |
index d93836a981ed7ae4a659fa14a5dd9cd478b3c062..5017cb4b5f074d1dbb228fc9e3fc85698d990868 100644 |
--- a/content/renderer/input/input_event_filter.cc |
+++ b/content/renderer/input/input_event_filter.cc |
@@ -10,7 +10,6 @@ |
#include "base/debug/trace_event.h" |
#include "base/location.h" |
#include "base/message_loop/message_loop_proxy.h" |
-#include "base/single_thread_task_runner.h" |
#include "cc/input/input_handler.h" |
#include "content/common/input/did_overscroll_params.h" |
#include "content/common/input/web_input_event_traits.h" |
@@ -42,9 +41,8 @@ |
InputEventFilter::InputEventFilter( |
IPC::Listener* main_listener, |
- const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, |
const scoped_refptr<base::MessageLoopProxy>& target_loop) |
- : main_task_runner_(main_task_runner), |
+ : main_loop_(base::MessageLoopProxy::current()), |
main_listener_(main_listener), |
sender_(NULL), |
target_loop_(target_loop), |
@@ -57,7 +55,7 @@ |
} |
void InputEventFilter::SetBoundHandler(const Handler& handler) { |
- DCHECK(main_task_runner_->BelongsToCurrentThread()); |
+ DCHECK(main_loop_->BelongsToCurrentThread()); |
handler_ = handler; |
} |
@@ -150,9 +148,10 @@ |
"input", |
"InputEventFilter::ForwardToHandler::ForwardToMainListener", |
TRACE_EVENT_SCOPE_THREAD); |
- main_task_runner_->PostTask( |
+ main_loop_->PostTask( |
FROM_HERE, |
- base::Bind(&InputEventFilter::ForwardToMainListener, this, message)); |
+ base::Bind(&InputEventFilter::ForwardToMainListener, |
+ this, message)); |
return; |
} |
@@ -184,9 +183,10 @@ |
TRACE_EVENT_SCOPE_THREAD); |
IPC::Message new_msg = InputMsg_HandleInputEvent( |
routing_id, event, latency_info, is_keyboard_shortcut); |
- main_task_runner_->PostTask( |
+ main_loop_->PostTask( |
FROM_HERE, |
- base::Bind(&InputEventFilter::ForwardToMainListener, this, new_msg)); |
+ base::Bind(&InputEventFilter::ForwardToMainListener, |
+ this, new_msg)); |
return; |
} |