Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Unified Diff: ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;

Powered by Google App Engine
This is Rietveld 408576698