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

Unified Diff: ui/ozone/platform/drm/common/scoped_drm_types.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/common/scoped_drm_types.h
diff --git a/ui/ozone/platform/drm/common/scoped_drm_types.h b/ui/ozone/platform/drm/common/scoped_drm_types.h
index a56f66199fdf7d35880680e039184ec1dc3c71d6..3522842b58a08e5f619b52129329455da9ae32f3 100644
--- a/ui/ozone/platform/drm/common/scoped_drm_types.h
+++ b/ui/ozone/platform/drm/common/scoped_drm_types.h
@@ -5,7 +5,7 @@
#ifndef UI_OZONE_PLATFORM_DRM_COMMON_SCOPED_DRM_TYPES_H_
#define UI_OZONE_PLATFORM_DRM_COMMON_SCOPED_DRM_TYPES_H_
-#include "base/memory/scoped_ptr.h"
+#include <memory>
typedef struct _drmModeConnector drmModeConnector;
typedef struct _drmModeCrtc drmModeCrtc;
@@ -57,21 +57,26 @@ struct DrmFramebufferDeleter {
void operator()(drmModeFB* framebuffer) const;
};
-typedef scoped_ptr<drmModeRes, DrmResourcesDeleter> ScopedDrmResourcesPtr;
-typedef scoped_ptr<drmModeConnector, DrmConnectorDeleter> ScopedDrmConnectorPtr;
-typedef scoped_ptr<drmModeCrtc, DrmCrtcDeleter> ScopedDrmCrtcPtr;
-typedef scoped_ptr<drmModeEncoder, DrmEncoderDeleter> ScopedDrmEncoderPtr;
-typedef scoped_ptr<drmModeObjectProperties, DrmObjectPropertiesDeleter>
+typedef std::unique_ptr<drmModeRes, DrmResourcesDeleter> ScopedDrmResourcesPtr;
+typedef std::unique_ptr<drmModeConnector, DrmConnectorDeleter>
+ ScopedDrmConnectorPtr;
+typedef std::unique_ptr<drmModeCrtc, DrmCrtcDeleter> ScopedDrmCrtcPtr;
+typedef std::unique_ptr<drmModeEncoder, DrmEncoderDeleter> ScopedDrmEncoderPtr;
+typedef std::unique_ptr<drmModeObjectProperties, DrmObjectPropertiesDeleter>
ScopedDrmObjectPropertyPtr;
-typedef scoped_ptr<drmModePlane, DrmPlaneDeleter> ScopedDrmPlanePtr;
-typedef scoped_ptr<drmModePlaneRes, DrmPlaneResDeleter> ScopedDrmPlaneResPtr;
-typedef scoped_ptr<drmModePropertyRes, DrmPropertyDeleter> ScopedDrmPropertyPtr;
+typedef std::unique_ptr<drmModePlane, DrmPlaneDeleter> ScopedDrmPlanePtr;
+typedef std::unique_ptr<drmModePlaneRes, DrmPlaneResDeleter>
+ ScopedDrmPlaneResPtr;
+typedef std::unique_ptr<drmModePropertyRes, DrmPropertyDeleter>
+ ScopedDrmPropertyPtr;
#if defined(USE_DRM_ATOMIC)
-typedef scoped_ptr<drmModeAtomicReq, DrmAtomicReqDeleter> ScopedDrmAtomicReqPtr;
+typedef std::unique_ptr<drmModeAtomicReq, DrmAtomicReqDeleter>
+ ScopedDrmAtomicReqPtr;
#endif // defined(USE_DRM_ATOMIC)
-typedef scoped_ptr<drmModePropertyBlobRes, DrmPropertyBlobDeleter>
+typedef std::unique_ptr<drmModePropertyBlobRes, DrmPropertyBlobDeleter>
ScopedDrmPropertyBlobPtr;
-typedef scoped_ptr<drmModeFB, DrmFramebufferDeleter> ScopedDrmFramebufferPtr;
+typedef std::unique_ptr<drmModeFB, DrmFramebufferDeleter>
+ ScopedDrmFramebufferPtr;
} // namespace ui
« no previous file with comments | « ui/ozone/platform/drm/common/client_native_pixmap_dmabuf.cc ('k') | ui/ozone/platform/drm/gpu/crtc_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698