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

Unified Diff: ui/gl/gl_surface_egl.cc

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
« no previous file with comments | « ui/gl/gl_surface_egl.h ('k') | ui/gl/gl_surface_glx.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_egl.cc
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index 0db0467e5550a7be3e4ce21599eb984218382c03..43befdd4eed00bc0e211e64cd61ed11020b6b72e 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -8,12 +8,12 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <vector>
#include "base/command_line.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h"
@@ -322,7 +322,7 @@ EGLConfig ChooseConfig(GLSurface::Format format) {
return config;
}
- scoped_ptr<EGLConfig[]> matching_configs(new EGLConfig[num_configs]);
+ std::unique_ptr<EGLConfig[]> matching_configs(new EGLConfig[num_configs]);
if (format == GLSurface::SURFACE_RGB565) {
config_size = num_configs;
config_data = matching_configs.get();
@@ -633,7 +633,7 @@ bool NativeViewGLSurfaceEGL::Initialize(GLSurface::Format format) {
}
bool NativeViewGLSurfaceEGL::Initialize(
- scoped_ptr<VSyncProvider> sync_provider) {
+ std::unique_ptr<VSyncProvider> sync_provider) {
DCHECK(!surface_);
if (!GetDisplay()) {
@@ -803,7 +803,7 @@ bool NativeViewGLSurfaceEGL::Resize(const gfx::Size& size,
size_ = size;
- scoped_ptr<ui::ScopedMakeCurrent> scoped_make_current;
+ std::unique_ptr<ui::ScopedMakeCurrent> scoped_make_current;
GLContext* current_context = GLContext::GetCurrent();
bool was_current =
current_context && current_context->IsCurrent(this);
@@ -1024,7 +1024,7 @@ bool PbufferGLSurfaceEGL::Resize(const gfx::Size& size,
if (size == size_)
return true;
- scoped_ptr<ui::ScopedMakeCurrent> scoped_make_current;
+ std::unique_ptr<ui::ScopedMakeCurrent> scoped_make_current;
GLContext* current_context = GLContext::GetCurrent();
bool was_current =
current_context && current_context->IsCurrent(this);
« no previous file with comments | « ui/gl/gl_surface_egl.h ('k') | ui/gl/gl_surface_glx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698