Index: ui/ozone/platform/drm/gpu/gbm_surface_factory.cc |
diff --git a/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc b/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc |
index 32762ee73ded99464ee38734896ad56c1f22cf68..931890fcc8db31330f776d0a0142fa2c023aa7d0 100644 |
--- a/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc |
+++ b/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc |
@@ -7,6 +7,7 @@ |
#include <gbm.h> |
#include "base/files/file_path.h" |
+#include "base/memory/ptr_util.h" |
#include "build/build_config.h" |
#include "third_party/khronos/EGL/egl.h" |
#include "ui/ozone/common/egl_util.h" |
@@ -61,24 +62,24 @@ bool GbmSurfaceFactory::LoadEGLGLES2Bindings( |
return LoadDefaultEGLGLES2Bindings(add_gl_library, set_gl_get_proc_address); |
} |
-scoped_ptr<SurfaceOzoneCanvas> GbmSurfaceFactory::CreateCanvasForWidget( |
+std::unique_ptr<SurfaceOzoneCanvas> GbmSurfaceFactory::CreateCanvasForWidget( |
gfx::AcceleratedWidget widget) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
LOG(ERROR) << "Software rendering mode is not supported with GBM platform"; |
return nullptr; |
} |
-scoped_ptr<SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget( |
+std::unique_ptr<SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget( |
gfx::AcceleratedWidget widget) { |
NOTREACHED(); |
return nullptr; |
} |
-scoped_ptr<SurfaceOzoneEGL> |
+std::unique_ptr<SurfaceOzoneEGL> |
GbmSurfaceFactory::CreateSurfacelessEGLSurfaceForWidget( |
gfx::AcceleratedWidget widget) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
- return make_scoped_ptr( |
+ return base::WrapUnique( |
new GbmSurfaceless(drm_thread_->CreateDrmWindowProxy(widget), this)); |
} |