| 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
|
|
|
|
|