| Index: ui/ozone/platform/dri/dri_gpu_platform_support.h
|
| diff --git a/ui/ozone/platform/dri/dri_gpu_platform_support.h b/ui/ozone/platform/dri/dri_gpu_platform_support.h
|
| index 2290955a13d65508593ef49395bc3e82a2613b96..0068f2078f9ff2df9fb85e24511a025f350b24a7 100644
|
| --- a/ui/ozone/platform/dri/dri_gpu_platform_support.h
|
| +++ b/ui/ozone/platform/dri/dri_gpu_platform_support.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef UI_OZONE_PLATFORM_DRI_DRI_GPU_PLATFORM_SUPPORT_H_
|
| #define UI_OZONE_PLATFORM_DRI_DRI_GPU_PLATFORM_SUPPORT_H_
|
|
|
| +#include <map>
|
| +
|
| #include "base/containers/scoped_ptr_hash_map.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| @@ -15,6 +17,7 @@
|
| class SkBitmap;
|
|
|
| namespace base {
|
| +class FileDescriptor;
|
| class FilePath;
|
| class SingleThreadTaskRunner;
|
| }
|
| @@ -30,6 +33,7 @@ class DriSurfaceFactory;
|
| class DriWindowDelegate;
|
| class DriWindowDelegateManager;
|
| class DriWrapper;
|
| +class DriWrapperGenerator;
|
| class DrmDeviceManager;
|
| class NativeDisplayDelegateDri;
|
| class ScreenManager;
|
| @@ -43,7 +47,8 @@ class DriGpuPlatformSupport : public GpuPlatformSupport {
|
| DrmDeviceManager* drm_device_manager,
|
| DriWindowDelegateManager* window_manager,
|
| ScreenManager* screen_manager,
|
| - scoped_ptr<NativeDisplayDelegateDri> ndd);
|
| + scoped_ptr<NativeDisplayDelegateDri> ndd,
|
| + scoped_ptr<DriWrapperGenerator> wrapper_generator);
|
| ~DriGpuPlatformSupport() override;
|
|
|
| void AddHandler(scoped_ptr<GpuPlatformSupport> handler);
|
| @@ -76,19 +81,21 @@ class DriGpuPlatformSupport : public GpuPlatformSupport {
|
| void OnDisableNativeDisplay(int64_t id);
|
| void OnTakeDisplayControl();
|
| void OnRelinquishDisplayControl();
|
| - void OnAddGraphicsDevice(const base::FilePath& path);
|
| + void OnAddGraphicsDevice(const base::FilePath& path,
|
| + const base::FileDescriptor& fd);
|
| void OnRemoveGraphicsDevice(const base::FilePath& path);
|
|
|
| void SetIOTaskRunner(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
|
|
|
| IPC::Sender* sender_; // Not owned.
|
| - scoped_refptr<DriWrapper> drm_;
|
| DrmDeviceManager* drm_device_manager_; // Not owned.
|
| DriWindowDelegateManager* window_manager_; // Not owned.
|
| ScreenManager* screen_manager_; // Not owned.
|
|
|
| + std::map<base::FilePath, scoped_refptr<DriWrapper>> wrappers_;
|
| scoped_ptr<NativeDisplayDelegateDri> ndd_;
|
| + scoped_ptr<DriWrapperGenerator> wrapper_generator_;
|
| ScopedVector<GpuPlatformSupport> handlers_;
|
| scoped_refptr<IPC::MessageFilter> filter_;
|
| scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
|
|
|