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

Unified Diff: ui/ozone/platform/drm/gpu/hardware_display_controller.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_controller.h
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_controller.h b/ui/ozone/platform/drm/gpu/hardware_display_controller.h
index 8ec577d1f1d65b8e6182d775f64f2fa64215561e..3738cf27d4459d4026e10f755c1b3ccc31d4cf6a 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_controller.h
+++ b/ui/ozone/platform/drm/gpu/hardware_display_controller.h
@@ -8,14 +8,15 @@
#include <stddef.h>
#include <stdint.h>
#include <xf86drmMode.h>
+
#include <deque>
#include <map>
+#include <memory>
#include <vector>
#include "base/callback.h"
#include "base/containers/scoped_ptr_hash_map.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "ui/gfx/swap_result.h"
#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
@@ -89,7 +90,7 @@ class HardwareDisplayController {
typedef base::Callback<void(gfx::SwapResult)> PageFlipCallback;
public:
- HardwareDisplayController(scoped_ptr<CrtcController> controller,
+ HardwareDisplayController(std::unique_ptr<CrtcController> controller,
const gfx::Point& origin);
~HardwareDisplayController();
@@ -134,9 +135,10 @@ class HardwareDisplayController {
// Moves the hardware cursor to |location|.
bool MoveCursor(const gfx::Point& location);
- void AddCrtc(scoped_ptr<CrtcController> controller);
- scoped_ptr<CrtcController> RemoveCrtc(const scoped_refptr<DrmDevice>& drm,
- uint32_t crtc);
+ void AddCrtc(std::unique_ptr<CrtcController> controller);
+ std::unique_ptr<CrtcController> RemoveCrtc(
+ const scoped_refptr<DrmDevice>& drm,
+ uint32_t crtc);
bool HasCrtc(const scoped_refptr<DrmDevice>& drm, uint32_t crtc) const;
bool IsMirrored() const;
bool IsDisabled() const;
@@ -147,7 +149,7 @@ class HardwareDisplayController {
uint64_t GetTimeOfLastFlip() const;
- const std::vector<scoped_ptr<CrtcController>>& crtc_controllers() const {
+ const std::vector<std::unique_ptr<CrtcController>>& crtc_controllers() const {
return crtc_controllers_;
}
@@ -158,12 +160,12 @@ class HardwareDisplayController {
bool test_only,
const PageFlipCallback& callback);
- base::ScopedPtrHashMap<DrmDevice*, scoped_ptr<HardwareDisplayPlaneList>>
+ base::ScopedPtrHashMap<DrmDevice*, std::unique_ptr<HardwareDisplayPlaneList>>
owned_hardware_planes_;
// Stores the CRTC configuration. This is used to identify monitors and
// configure them.
- std::vector<scoped_ptr<CrtcController>> crtc_controllers_;
+ std::vector<std::unique_ptr<CrtcController>> crtc_controllers_;
// Location of the controller on the screen.
gfx::Point origin_;
« no previous file with comments | « ui/ozone/platform/drm/gpu/gbm_surfaceless.cc ('k') | ui/ozone/platform/drm/gpu/hardware_display_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698