[PATCH 11/11] ozone: evdev: Add dedicated events thread

ui/events/ozone/evdev/event_factory_evdev.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/worker_pool.h"
 #include "base/time/time.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/ozone/device/device_event.h"
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/input_controller_evdev.h"
 #include "ui/events/ozone/evdev/input_device_factory_evdev.h"
 #include "ui/events/ozone/evdev/input_device_factory_evdev_proxy.h"
 #include "ui/events/ozone/evdev/input_injector_evdev.h"
 
 namespace ui {
 
 namespace {
 
 // Thread safe dispatcher proxy for EventFactoryEvdev.
+//
+// This is used on the device I/O thread for dispatching to UI.
 class ProxyDeviceEventDispatcher : public DeviceEventDispatcherEvdev {
  public:
   ProxyDeviceEventDispatcher(
       scoped_refptr<base::SingleThreadTaskRunner> ui_thread_runner,
       base::WeakPtr<EventFactoryEvdev> event_factory_evdev)
       : ui_thread_runner_(ui_thread_runner),
         event_factory_evdev_(event_factory_evdev) {}
   ~ProxyDeviceEventDispatcher() override {}
 
   // DeviceEventDispatcher:
@@ skipping 83 matching lines @@
       weak_ptr_factory_(this) {
   DCHECK(device_manager_);
 }
 
 EventFactoryEvdev::~EventFactoryEvdev() {
 }
 
 void EventFactoryEvdev::Init() {
   DCHECK(!initialized_);
 
-  // Set up device factory.
-  scoped_ptr<DeviceEventDispatcherEvdev> dispatcher(
-      new ProxyDeviceEventDispatcher(base::ThreadTaskRunnerHandle::Get(),
-                                          weak_ptr_factory_.GetWeakPtr()));
-  input_device_factory_.reset(
-      new InputDeviceFactoryEvdev(dispatcher.Pass(), cursor_));
-  input_device_factory_proxy_.reset(
-      new InputDeviceFactoryEvdevProxy(base::ThreadTaskRunnerHandle::Get(),
-                                       input_device_factory_->GetWeakPtr()));
-
-  // TODO(spang): This settings interface is really broken. crbug.com/450899
-  input_controller_.SetInputDeviceFactory(input_device_factory_proxy_.get());
-
-  // Scan & monitor devices.
-  device_manager_->AddObserver(this);
-  device_manager_->ScanDevices(this);
+  StartThread();
 
   initialized_ = true;
 }
 
 scoped_ptr<SystemInputInjector> EventFactoryEvdev::CreateSystemInputInjector() {
   // Use forwarding dispatcher for the injector rather than dispatching
   // directly. We cannot assume it is safe to (re-)enter ui::Event dispatch
   // synchronously from the injection point.
-  scoped_ptr<DeviceEventDispatcherEvdev> dispatcher(
+  scoped_ptr<DeviceEventDispatcherEvdev> proxy_dispatcher(
       new ProxyDeviceEventDispatcher(base::ThreadTaskRunnerHandle::Get(),
                                      weak_ptr_factory_.GetWeakPtr()));
-  return make_scoped_ptr(new InputInjectorEvdev(dispatcher.Pass(), cursor_));
+  return make_scoped_ptr(
+      new InputInjectorEvdev(proxy_dispatcher.Pass(), cursor_));
 }
 
 void EventFactoryEvdev::DispatchKeyEvent(const KeyEventParams& params) {
   keyboard_.OnKeyChange(params.code, params.down);
 }
 
 void EventFactoryEvdev::DispatchMouseMoveEvent(
     const MouseMoveEventParams& params) {
   MouseEvent event(ui::ET_MOUSE_MOVED, params.location, params.location,
                    modifiers_.GetModifierFlags(),
@@ skipping 141 matching lines @@
       FROM_HERE, base::Bind(&EventFactoryEvdev::DispatchMouseMoveEvent,
                             weak_ptr_factory_.GetWeakPtr(),
                             MouseMoveEventParams(-1 /* device_id */,
                                                  cursor_->GetLocation())));
 }
 
 int EventFactoryEvdev::NextDeviceId() {
   return ++last_device_id_;
 }
 
+void EventFactoryEvdev::StartThread() {
+  // Set up device factory.
+  scoped_ptr<DeviceEventDispatcherEvdev> proxy_dispatcher(
+      new ProxyDeviceEventDispatcher(base::ThreadTaskRunnerHandle::Get(),
+                                     weak_ptr_factory_.GetWeakPtr()));
+  thread_.Start(proxy_dispatcher.Pass(), cursor_,
+                base::Bind(&EventFactoryEvdev::OnThreadStarted,
+                           weak_ptr_factory_.GetWeakPtr()));
+}
+
+void EventFactoryEvdev::OnThreadStarted(
+    scoped_ptr<InputDeviceFactoryEvdevProxy> input_device_factory) {
+  input_device_factory_proxy_ = input_device_factory.Pass();
+
+  // TODO(spang): This settings interface is really broken. crbug.com/450899
+  input_controller_.SetInputDeviceFactory(input_device_factory_proxy_.get());
+
+  // Scan & monitor devices.
+  device_manager_->AddObserver(this);
+  device_manager_->ScanDevices(this);
+}
+
 }  // namespace ui