diff options
| author | dcheng <dcheng@chromium.org> | 2015-11-18 23:00:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-19 07:01:23 +0000 |
| commit | 0917ec4328dc20b59887d78f76b9f075e12e5f7f (patch) | |
| tree | e2e24def30f3b6619eb1b92d570b055bfcef9672 /ui/gl | |
| parent | d076ca806251e4b636b421eb46ca04d14366b2cc (diff) | |
| download | chromium_src-0917ec4328dc20b59887d78f76b9f075e12e5f7f.zip chromium_src-0917ec4328dc20b59887d78f76b9f075e12e5f7f.tar.gz chromium_src-0917ec4328dc20b59887d78f76b9f075e12e5f7f.tar.bz2 | |
Use std::default_delete as the default deleter for scoped_ptr.
The aim is to make scoped_ptr and std::unique_ptr functionally
identical so scoped_ptr can simply be a typedef.
BUG=554298
Review URL: https://codereview.chromium.org/1445003002
Cr-Commit-Position: refs/heads/master@{#360539}
Diffstat (limited to 'ui/gl')
| -rw-r--r-- | ui/gl/gl_surface_osmesa.cc | 5 | ||||
| -rw-r--r-- | ui/gl/gpu_timing.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/gl/gl_surface_osmesa.cc b/ui/gl/gl_surface_osmesa.cc index f488274..a13b506 100644 --- a/ui/gl/gl_surface_osmesa.cc +++ b/ui/gl/gl_surface_osmesa.cc @@ -2,12 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ui/gl/gl_surface_osmesa.h" + +#include <algorithm> + #include "base/logging.h" #include "base/numerics/safe_math.h" #include "third_party/mesa/src/include/GL/osmesa.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_context.h" -#include "ui/gl/gl_surface_osmesa.h" #include "ui/gl/scoped_make_current.h" namespace gfx { diff --git a/ui/gl/gpu_timing.h b/ui/gl/gpu_timing.h index 5d72d7c..4082b91 100644 --- a/ui/gl/gpu_timing.h +++ b/ui/gl/gpu_timing.h @@ -5,6 +5,7 @@ #ifndef UI_GL_GPU_TIMING_H_ #define UI_GL_GPU_TIMING_H_ +#include <memory> #include <queue> #include "base/callback.h" @@ -58,7 +59,7 @@ class GPUTiming { }; protected: - friend struct base::DefaultDeleter<GPUTiming>; + friend std::default_delete<GPUTiming>; friend class GLContextReal; static GPUTiming* CreateGPUTiming(GLContextReal* context); |