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

Unified Diff: ui/gl/gl_surface_ozone.cc

Issue 1530923002: Replace Pass() with std::move in ui/gl and ui/gfx (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/gl/gl_surface_ozone.cc
diff --git a/ui/gl/gl_surface_ozone.cc b/ui/gl/gl_surface_ozone.cc
index c9c7a9cdc0c85f2f67879bf12ea2863c23f0a3d9..c596c2928b328223d8d4431ad45649163cfaaf86 100644
--- a/ui/gl/gl_surface_ozone.cc
+++ b/ui/gl/gl_surface_ozone.cc
@@ -75,7 +75,7 @@ GLSurfaceOzoneEGL::GLSurfaceOzoneEGL(
scoped_ptr<ui::SurfaceOzoneEGL> ozone_surface,
AcceleratedWidget widget)
: NativeViewGLSurfaceEGL(ozone_surface->GetNativeWindow()),
- ozone_surface_(ozone_surface.Pass()),
+ ozone_surface_(std::move(ozone_surface)),
widget_(widget) {}
bool GLSurfaceOzoneEGL::Initialize() {
@@ -219,7 +219,7 @@ GLSurfaceOzoneSurfaceless::GLSurfaceOzoneSurfaceless(
scoped_ptr<ui::SurfaceOzoneEGL> ozone_surface,
AcceleratedWidget widget)
: SurfacelessEGL(gfx::Size()),
- ozone_surface_(ozone_surface.Pass()),
+ ozone_surface_(std::move(ozone_surface)),
widget_(widget),
has_implicit_external_sync_(
HasEGLExtension("EGL_ARM_implicit_external_sync")),
@@ -449,7 +449,7 @@ class GL_EXPORT GLSurfaceOzoneSurfacelessSurfaceImpl
GLSurfaceOzoneSurfacelessSurfaceImpl::GLSurfaceOzoneSurfacelessSurfaceImpl(
scoped_ptr<ui::SurfaceOzoneEGL> ozone_surface,
AcceleratedWidget widget)
- : GLSurfaceOzoneSurfaceless(ozone_surface.Pass(), widget),
+ : GLSurfaceOzoneSurfaceless(std::move(ozone_surface), widget),
context_(nullptr),
fbo_(0),
current_surface_(0) {
@@ -594,7 +594,7 @@ scoped_refptr<GLSurface> CreateViewGLSurfaceOzone(
if (!surface_ozone)
return nullptr;
scoped_refptr<GLSurface> surface =
- new GLSurfaceOzoneEGL(surface_ozone.Pass(), window);
+ new GLSurfaceOzoneEGL(std::move(surface_ozone), window);
if (!surface->Initialize())
return nullptr;
return surface;
@@ -608,8 +608,8 @@ scoped_refptr<GLSurface> CreateViewGLSurfaceOzoneSurfacelessSurfaceImpl(
->CreateSurfacelessEGLSurfaceForWidget(window);
if (!surface_ozone)
return nullptr;
- scoped_refptr<GLSurface> surface =
- new GLSurfaceOzoneSurfacelessSurfaceImpl(surface_ozone.Pass(), window);
+ scoped_refptr<GLSurface> surface = new GLSurfaceOzoneSurfacelessSurfaceImpl(
+ std::move(surface_ozone), window);
if (!surface->Initialize())
return nullptr;
return surface;
@@ -648,7 +648,7 @@ scoped_refptr<GLSurface> GLSurface::CreateSurfacelessViewGLSurface(
if (!surface_ozone)
return nullptr;
scoped_refptr<GLSurface> surface;
- surface = new GLSurfaceOzoneSurfaceless(surface_ozone.Pass(), window);
+ surface = new GLSurfaceOzoneSurfaceless(std::move(surface_ozone), window);
if (surface->Initialize())
return surface;
}

Powered by Google App Engine
This is Rietveld 408576698