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

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

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.cc
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
index 37ce65322b7dc556dac3fba6c72751674386ca68..90147a893d8a2d83e4a56cf436956a6f0557a392 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
@@ -100,7 +100,7 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
uint32_t formats_size = drm_plane->count_formats;
plane_ids.insert(drm_plane->plane_id);
- scoped_ptr<HardwareDisplayPlane> plane(
+ std::unique_ptr<HardwareDisplayPlane> plane(
CreatePlane(drm_plane->plane_id, drm_plane->possible_crtcs));
std::vector<uint32_t> supported_formats(formats_size);
@@ -123,7 +123,7 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
if (!has_universal_planes) {
for (int i = 0; i < resources->count_crtcs; ++i) {
if (plane_ids.find(resources->crtcs[i] - 1) == plane_ids.end()) {
- scoped_ptr<HardwareDisplayPlane> dummy_plane(
+ std::unique_ptr<HardwareDisplayPlane> dummy_plane(
CreatePlane(resources->crtcs[i] - 1, (1 << i)));
if (dummy_plane->Initialize(drm, std::vector<uint32_t>(), true,
false)) {
@@ -134,8 +134,8 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
}
std::sort(planes_.begin(), planes_.end(),
- [](const scoped_ptr<HardwareDisplayPlane>& l,
- const scoped_ptr<HardwareDisplayPlane>& r) {
+ [](const std::unique_ptr<HardwareDisplayPlane>& l,
+ const std::unique_ptr<HardwareDisplayPlane>& r) {
return l->plane_id() < r->plane_id();
});
@@ -143,10 +143,10 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
return true;
}
-scoped_ptr<HardwareDisplayPlane> HardwareDisplayPlaneManager::CreatePlane(
+std::unique_ptr<HardwareDisplayPlane> HardwareDisplayPlaneManager::CreatePlane(
uint32_t plane_id,
uint32_t possible_crtcs) {
- return scoped_ptr<HardwareDisplayPlane>(
+ return std::unique_ptr<HardwareDisplayPlane>(
new HardwareDisplayPlane(plane_id, possible_crtcs));
}

Powered by Google App Engine
This is Rietveld 408576698