Make ozone/drm/mojo more immune to startup races

ui/ozone/platform/drm/mus_thread_proxy.h

 // Copyright 2016 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.
 
 #ifndef UI_OZONE_PLATFORM_DRM_MUS_THREAD_PROXY_H_
 #define UI_OZONE_PLATFORM_DRM_MUS_THREAD_PROXY_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/synchronization/lock.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/ozone/platform/drm/gpu/inter_thread_messaging_proxy.h"
 #include "ui/ozone/platform/drm/host/drm_cursor.h"
 #include "ui/ozone/platform/drm/host/gpu_thread_adapter.h"
 #include "ui/ozone/public/interfaces/device_cursor.mojom.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
+namespace service_manager {
+class Connector;
+}
+
 namespace ui {
 
 class DrmDisplayHostManager;
 class DrmOverlayManager;
 class DrmThread;
 class GpuThreadObserver;
 class MusThreadProxy;
 
-// Forwarding proxy to handle ownership semantics.
-class CursorProxyThread : public DrmCursorProxy {
- public:
-  explicit CursorProxyThread(MusThreadProxy* mus_thread_proxy);
-  ~CursorProxyThread() override;
-
- private:
-  // DrmCursorProxy.
-  void CursorSet(gfx::AcceleratedWidget window,
-                 const std::vector<SkBitmap>& bitmaps,
-                 const gfx::Point& point,
-                 int frame_delay_ms) override;
-  void Move(gfx::AcceleratedWidget window, const gfx::Point& point) override;
-  void InitializeOnEvdev() override;
-  MusThreadProxy* const mus_thread_proxy_;  // Not owned.
-};
-
 // In Mus, the window server thread (analogous to Chrome's UI thread), GPU and
 // DRM threads coexist in a single Mus process. The |MusThreadProxy| connects
 // these threads together via cross-thread calls.
 class MusThreadProxy : public GpuThreadAdapter,
                        public InterThreadMessagingProxy,
                        public DrmCursorProxy {
  public:
-  MusThreadProxy();
+  MusThreadProxy(DrmCursor* cursor, service_manager::Connector* connector);
   ~MusThreadProxy() override;
 
   void StartDrmThread();
   void ProvideManagers(DrmDisplayHostManager* display_manager,
                        DrmOverlayManager* overlay_manager);
 
   // InterThreadMessagingProxy.
   void SetDrmThread(DrmThread* thread) override;
 
   // This is the core functionality. They are invoked when we have a main
@@ skipping 40 matching lines @@
   bool GpuCreateWindow(gfx::AcceleratedWidget widget) override;
   bool GpuWindowBoundsChanged(gfx::AcceleratedWidget widget,
                               const gfx::Rect& bounds) override;
 
   // DrmCursorProxy.
   void CursorSet(gfx::AcceleratedWidget window,
                  const std::vector<SkBitmap>& bitmaps,
                  const gfx::Point& point,
                  int frame_delay_ms) override;
   void Move(gfx::AcceleratedWidget window, const gfx::Point& point) override;
-  void InitializeOnEvdev() override;
+  void InitializeOnEvdevIfNecessary() override;
 
  private:
   void RunObservers();
   void DispatchObserversFromDrmThread();
 
   void GpuCheckOverlayCapabilitiesCallback(
       gfx::AcceleratedWidget widget,
       const std::vector<OverlayCheck_Params>& overlays) const;
 
   void GpuConfigureNativeDisplayCallback(int64_t display_id,
@@ skipping 11 matching lines @@
 
   scoped_refptr<base::SingleThreadTaskRunner> ws_task_runner_;
 
   DrmThread* drm_thread_;  // Not owned.
 
   // Guards  for multi-theaded access to drm_thread_.
   base::Lock lock_;
 
   DrmDisplayHostManager* display_manager_;  // Not owned.
   DrmOverlayManager* overlay_manager_;      // Not owned.
+  DrmCursor* cursor_;                       // Not owned.
+
+  service_manager::Connector* connector_;
 
   base::ObserverList<GpuThreadObserver> gpu_thread_observers_;
 
   base::ThreadChecker on_window_server_thread_;
 
   base::WeakPtrFactory<MusThreadProxy> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MusThreadProxy);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_MUS_THREAD_PROXY_H_