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 fa31658a74bcaeab9f63aae77d9c4c1f00208f1a..fc99e1c5fdeb1bd0d0991d4e37c5a48035970901 100644 |
--- a/content/renderer/input/input_event_filter.cc |
+++ b/content/renderer/input/input_event_filter.cc |
@@ -10,6 +10,7 @@ |
#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" |
@@ -41,9 +42,10 @@ namespace content { |
InputEventFilter::InputEventFilter( |
IPC::Listener* main_listener, |
+ const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, |
const scoped_refptr<base::MessageLoopProxy>& target_loop) |
- : main_loop_(base::MessageLoopProxy::current()), |
- main_listener_(main_listener), |
+ : main_listener_(main_listener), |
+ main_task_runner_(main_task_runner), |
sender_(NULL), |
target_loop_(target_loop), |
overscroll_notifications_enabled_(false), |
@@ -55,7 +57,6 @@ InputEventFilter::InputEventFilter( |
} |
void InputEventFilter::SetBoundHandler(const Handler& handler) { |
- DCHECK(main_loop_->BelongsToCurrentThread()); |
handler_ = handler; |
} |
@@ -148,7 +149,7 @@ void InputEventFilter::ForwardToHandler(const IPC::Message& message) { |
"input", |
"InputEventFilter::ForwardToHandler::ForwardToMainListener", |
TRACE_EVENT_SCOPE_THREAD); |
- main_loop_->PostTask( |
+ main_task_runner_->PostTask( |
FROM_HERE, |
base::Bind(&InputEventFilter::ForwardToMainListener, |
this, message)); |
@@ -181,7 +182,7 @@ void InputEventFilter::ForwardToHandler(const IPC::Message& message) { |
TRACE_EVENT_SCOPE_THREAD); |
IPC::Message new_msg = InputMsg_HandleInputEvent( |
routing_id, event, latency_info, is_keyboard_shortcut); |
- main_loop_->PostTask( |
+ main_task_runner_->PostTask( |
FROM_HERE, |
base::Bind(&InputEventFilter::ForwardToMainListener, |
this, new_msg)); |