[PATCH 10/11] ozone: evdev: Add a device factory proxy that forwards to device 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 "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_proxy_evdev.h"
 #include "ui/events/ozone/evdev/input_injector_evdev.h"
 
 namespace ui {
 
 namespace {
 
 class ForwardingDeviceEventDispatcher : public DeviceEventDispatcherEvdev {
  public:
   ForwardingDeviceEventDispatcher(
       scoped_refptr<base::SingleThreadTaskRunner> ui_thread_runner,
@@ skipping 103 matching lines @@
 
 void EventFactoryEvdev::Init() {
   DCHECK(!initialized_);
 
   // Set up device factory.
   scoped_ptr<DeviceEventDispatcherEvdev> dispatcher(
       new ForwardingDeviceEventDispatcher(base::ThreadTaskRunnerHandle::Get(),
                                           weak_ptr_factory_.GetWeakPtr()));
   input_device_factory_.reset(
       new InputDeviceFactoryEvdev(dispatcher.Pass(), cursor_));
+  input_device_factory_proxy_.reset(
+      new InputDeviceFactoryProxyEvdev(base::ThreadTaskRunnerHandle::Get(),
+                                       input_device_factory_->GetWeakPtr()));
 
   // TODO(spang): This settings interface is really broken. crbug.com/450899
-  input_controller_.SetInputDeviceFactory(input_device_factory_.get());
+  input_controller_.SetInputDeviceFactory(input_device_factory_proxy_.get());
 
   // Scan & monitor devices.
   device_manager_->AddObserver(this);
   device_manager_->ScanDevices(this);
 
   initialized_ = true;
 }
 
 scoped_ptr<SystemInputInjector> EventFactoryEvdev::CreateSystemInputInjector() {
   return make_scoped_ptr(new InputInjectorEvdev(
@@ skipping 129 matching lines @@
 }
 
 void EventFactoryEvdev::OnDeviceEvent(const DeviceEvent& event) {
   if (event.device_type() != DeviceEvent::INPUT)
     return;
 
   switch (event.action_type()) {
     case DeviceEvent::ADD:
     case DeviceEvent::CHANGE: {
       TRACE_EVENT1("ozone", "OnDeviceAdded", "path", event.path().value());
-      input_device_factory_->AddInputDevice(NextDeviceId(), event.path());
+      input_device_factory_proxy_->AddInputDevice(NextDeviceId(), event.path());
       break;
     }
     case DeviceEvent::REMOVE: {
       TRACE_EVENT1("ozone", "OnDeviceRemoved", "path", event.path().value());
-      input_device_factory_->RemoveInputDevice(event.path());
+      input_device_factory_proxy_->RemoveInputDevice(event.path());
       break;
     }
   }
 }
 
 void EventFactoryEvdev::OnDispatcherListChanged() {
   if (!initialized_)
     Init();
 }
 
 void EventFactoryEvdev::WarpCursorTo(gfx::AcceleratedWidget widget,
                                      const gfx::PointF& location) {
   if (cursor_) {
     cursor_->MoveCursorTo(widget, location);
     PostUiEvent(make_scoped_ptr(new MouseEvent(ET_MOUSE_MOVED,
                                                cursor_->GetLocation(),
                                                cursor_->GetLocation(),
                                                modifiers_.GetModifierFlags(),
                                                /* changed_button_flags */ 0)));
   }
 }
 
 int EventFactoryEvdev::NextDeviceId() {
   return ++last_device_id_;
 }
 
 }  // namespace ui