Index: ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h |
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h |
index 3efdd8b03045f85e6752670b2a41817b219690b2..e18485c567b144b6e62eda1c8cbd02963fbb312e 100644 |
--- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h |
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h |
@@ -92,7 +92,7 @@ class HardwareDisplayPlaneManager { |
virtual bool Commit(HardwareDisplayPlaneList* plane_list, |
bool test_only) = 0; |
- const std::vector<scoped_ptr<HardwareDisplayPlane>>& planes() { |
+ const std::vector<std::unique_ptr<HardwareDisplayPlane>>& planes() { |
return planes_; |
} |
@@ -112,8 +112,9 @@ class HardwareDisplayPlaneManager { |
const gfx::Rect& src_rect, |
CrtcController* crtc) = 0; |
- virtual scoped_ptr<HardwareDisplayPlane> CreatePlane(uint32_t plane_id, |
- uint32_t possible_crtcs); |
+ virtual std::unique_ptr<HardwareDisplayPlane> CreatePlane( |
+ uint32_t plane_id, |
+ uint32_t possible_crtcs); |
// Finds the plane located at or after |*index| that is not in use and can |
// be used with |crtc_index|. |
@@ -139,7 +140,7 @@ class HardwareDisplayPlaneManager { |
// calls to control it. Not owned. |
DrmDevice* drm_; |
- std::vector<scoped_ptr<HardwareDisplayPlane>> planes_; |
+ std::vector<std::unique_ptr<HardwareDisplayPlane>> planes_; |
std::vector<uint32_t> crtcs_; |
std::vector<uint32_t> supported_formats_; |