Switch DRM platform to using a separate thread

ui/ozone/platform/drm/gpu/message_filter_proxy.h

Index: ui/ozone/platform/drm/gpu/message_filter_proxy.h
diff --git a/ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h b/ui/ozone/platform/drm/gpu/message_filter_proxy.h
similarity index 54%
copy from ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h
copy to ui/ozone/platform/drm/gpu/message_filter_proxy.h
index 21caf35e6550877b29c2cadb9133d99aad7ba639..a827ca1a2f42e46afca986f648dd4d7b16cb5ee3 100644
--- a/ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h
+++ b/ui/ozone/platform/drm/gpu/message_filter_proxy.h
@@ -1,23 +1,19 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 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_GPU_DRM_GPU_PLATFORM_SUPPORT_H_
-#define UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_PLATFORM_SUPPORT_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_MESSAGE_FILTER_PROXY_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_MESSAGE_FILTER_PROXY_H_
 
-#include "base/containers/scoped_ptr_hash_map.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "ipc/message_filter.h"
 #include "ui/display/types/display_constants.h"
+#include "ui/display/types/gamma_ramp_rgb_entry.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/ozone/public/gpu_platform_support.h"
-
-class SkBitmap;
 
 namespace base {
+class FileDescriptor;
 class FilePath;
-class SingleThreadTaskRunner;
-struct FileDescriptor;
 }
 
 namespace gfx {
@@ -27,34 +23,22 @@ class Rect;
 
 namespace ui {
 
-class DrmDeviceManager;
-class DrmGpuDisplayManager;
-class DrmSurfaceFactory;
-class DrmWindow;
-class ScreenManager;
-class ScanoutBufferGenerator;
-
+class DrmThread;
 struct DisplayMode_Params;
 struct DisplaySnapshot_Params;
 struct OverlayCheck_Params;
-struct GammaRampRGBEntry;
 
-class DrmGpuPlatformSupport : public GpuPlatformSupport {
+class MessageFilterProxy : public IPC::MessageFilter {

[spang, 2015/09/30 18:17:35]

I think DrmThread(Proxy?)MessageFilter.

Otherwise I parse this as "proxy for the message filter", but as there isn't a
message filter inside the thread to proxy it doesn't make much sense, while
"message filter for the drm thread" does.

[dnicoara, 2015/10/01 14:36:15]

Hmm, I see what you mean. I was going for a uniform naming convention. The
"Filter" term doesn't really apply on the DRM thread side. How about
DrmThreadMessageProxy?

  public:
-  DrmGpuPlatformSupport(DrmDeviceManager* drm_device_manager,
-                        ScreenManager* screen_manager,
-                        ScanoutBufferGenerator* buffer_generator,
-                        scoped_ptr<DrmGpuDisplayManager> display_manager);
-  ~DrmGpuPlatformSupport() override;
-
-  // GpuPlatformSupport:
-  void OnChannelEstablished(IPC::Sender* sender) override;
-  IPC::MessageFilter* GetMessageFilter() override;
+  MessageFilterProxy(DrmThread* drm_thread);
 
-  // IPC::Listener:
+  // IPC::MessageFilter:
+  void OnFilterAdded(IPC::Sender* sender) override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
+  ~MessageFilterProxy() override;
+
   void OnCreateWindow(gfx::AcceleratedWidget widget);
   void OnDestroyWindow(gfx::AcceleratedWidget widget);
   void OnWindowBoundsChanged(gfx::AcceleratedWidget widget,
@@ -83,18 +67,28 @@ class DrmGpuPlatformSupport : public GpuPlatformSupport {
   void OnSetHDCPState(int64_t display_id, HDCPState state);
   void OnSetGammaRamp(int64_t id, const std::vector<GammaRampRGBEntry>& lut);
 
-  void SetIOTaskRunner(
-      const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
+  void OnCheckOverlayCapabilitiesCallback(gfx::AcceleratedWidget widget,
+                                          bool success) const;
+  void OnRefreshNativeDisplaysCallback(
+      const std::vector<DisplaySnapshot_Params>& displays) const;
+  void OnConfigureNativeDisplayCallback(int64_t display_id, bool success) const;
+  void OnDisableNativeDisplayCallback(int64_t display_id, bool success) const;
+  void OnTakeDisplayControlCallback(bool success) const;
+  void OnRelinquishDisplayControlCallback(bool success) const;
+  void OnGetHDCPStateCallback(int64_t display_id,
+                              bool success,
+                              HDCPState state) const;
+  void OnSetHDCPStateCallback(int64_t display_id, bool success) const;
+
+  DrmThread* drm_thread_;
+
+  IPC::Sender* sender_ = nullptr;
 
-  IPC::Sender* sender_ = nullptr;             // Not owned.
-  DrmDeviceManager* drm_device_manager_;  // Not owned.
-  ScreenManager* screen_manager_;         // Not owned.
-  ScanoutBufferGenerator* buffer_generator_;  // Not owned.
+  base::WeakPtrFactory<MessageFilterProxy> weak_ptr_factory_;
 
-  scoped_ptr<DrmGpuDisplayManager> display_manager_;
-  scoped_refptr<IPC::MessageFilter> filter_;
+  DISALLOW_COPY_AND_ASSIGN(MessageFilterProxy);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_PLATFORM_SUPPORT_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_MESSAGE_FILTER_PROXY_H_