| Index: ui/ozone/platform/dri/drm_device_manager.h
|
| diff --git a/ui/ozone/platform/dri/drm_device_manager.h b/ui/ozone/platform/dri/drm_device_manager.h
|
| index 03133abb105837fa14995d69d24ce2f8d909d03b..5a7431e2baf66ced4acafc0767f32cc45dbb2c92 100644
|
| --- a/ui/ozone/platform/dri/drm_device_manager.h
|
| +++ b/ui/ozone/platform/dri/drm_device_manager.h
|
| @@ -14,28 +14,28 @@
|
|
|
| namespace ui {
|
|
|
| -class DriWrapper;
|
| +class DrmDevice;
|
|
|
| // Tracks the mapping between widgets and the DRM devices used to allocate
|
| // buffers for the window represented by the widget.
|
| class OZONE_EXPORT DrmDeviceManager {
|
| public:
|
| - DrmDeviceManager(const scoped_refptr<DriWrapper>& primary_device);
|
| + DrmDeviceManager(const scoped_refptr<DrmDevice>& primary_device);
|
| ~DrmDeviceManager();
|
|
|
| // Updates the device associated with |widget|.
|
| void UpdateDrmDevice(gfx::AcceleratedWidget widget,
|
| - const scoped_refptr<DriWrapper>& device);
|
| + const scoped_refptr<DrmDevice>& device);
|
|
|
| // Removes the device associated with |widget|.
|
| void RemoveDrmDevice(gfx::AcceleratedWidget widget);
|
|
|
| // Returns the device associated with |widget|. If there is no association
|
| // returns |primary_device_|.
|
| - scoped_refptr<DriWrapper> GetDrmDevice(gfx::AcceleratedWidget widget);
|
| + scoped_refptr<DrmDevice> GetDrmDevice(gfx::AcceleratedWidget widget);
|
|
|
| private:
|
| - std::map<gfx::AcceleratedWidget, scoped_refptr<DriWrapper>> drm_device_map_;
|
| + std::map<gfx::AcceleratedWidget, scoped_refptr<DrmDevice>> drm_device_map_;
|
|
|
| // This device represents the primary graphics device and is used when:
|
| // 1) 'widget == kNullAcceleratedWidget' when the API requesting a buffer has
|
| @@ -43,7 +43,7 @@ class OZONE_EXPORT DrmDeviceManager {
|
| // for video buffers), or
|
| // 2) in order to allocate buffers for unmatched surfaces (surfaces without a
|
| // display; ie: when in headless mode).
|
| - scoped_refptr<DriWrapper> primary_device_;
|
| + scoped_refptr<DrmDevice> primary_device_;
|
|
|
| // This class is accessed from the main thread and the IO thread. This lock
|
| // protects access to the device map.
|
|
|