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

Side by Side Diff: ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h" 5 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "ui/ozone/platform/drm/gpu/crtc_controller.h" 8 #include "ui/ozone/platform/drm/gpu/crtc_controller.h"
9 #include "ui/ozone/platform/drm/gpu/drm_device.h" 9 #include "ui/ozone/platform/drm/gpu/drm_device.h"
10 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_atomic.h" 10 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_atomic.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 if (!atomic_plane->SetPlaneData(plane_list->atomic_property_set.get(), 98 if (!atomic_plane->SetPlaneData(plane_list->atomic_property_set.get(),
99 crtc_id, overlay.buffer->GetFramebufferId(), 99 crtc_id, overlay.buffer->GetFramebufferId(),
100 overlay.display_bounds, src_rect)) { 100 overlay.display_bounds, src_rect)) {
101 LOG(ERROR) << "Failed to set plane properties"; 101 LOG(ERROR) << "Failed to set plane properties";
102 return false; 102 return false;
103 } 103 }
104 atomic_plane->set_crtc(crtc); 104 atomic_plane->set_crtc(crtc);
105 return true; 105 return true;
106 } 106 }
107 107
108 scoped_ptr<HardwareDisplayPlane> HardwareDisplayPlaneManagerAtomic::CreatePlane( 108 std::unique_ptr<HardwareDisplayPlane>
109 uint32_t plane_id, 109 HardwareDisplayPlaneManagerAtomic::CreatePlane(uint32_t plane_id,
110 uint32_t possible_crtcs) { 110 uint32_t possible_crtcs) {
111 return scoped_ptr<HardwareDisplayPlane>( 111 return std::unique_ptr<HardwareDisplayPlane>(
112 new HardwareDisplayPlaneAtomic(plane_id, possible_crtcs)); 112 new HardwareDisplayPlaneAtomic(plane_id, possible_crtcs));
113 } 113 }
114 114
115 } // namespace ui 115 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698