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

Unified Diff: content/browser/compositor/gl_helper_scaling.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « content/browser/compositor/gl_helper_benchmark.cc ('k') | content/browser/compositor/gl_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/gl_helper_scaling.cc
diff --git a/content/browser/compositor/gl_helper_scaling.cc b/content/browser/compositor/gl_helper_scaling.cc
index 0c7d9775f35c82fb5a40006130ac77a11f4c3e89..3fe193392ca2224b5b60abe630187784e6270aaa 100644
--- a/content/browser/compositor/gl_helper_scaling.cc
+++ b/content/browser/compositor/gl_helper_scaling.cc
@@ -169,7 +169,7 @@ class ScalerImpl : public GLHelper::ScalerInterface,
ScopedFramebufferBinder<GL_FRAMEBUFFER> framebuffer_binder(
gl_, dst_framebuffer_);
DCHECK_GT(dest_textures.size(), 0U);
- scoped_ptr<GLenum[]> buffers(new GLenum[dest_textures.size()]);
+ std::unique_ptr<GLenum[]> buffers(new GLenum[dest_textures.size()]);
for (size_t t = 0; t < dest_textures.size(); t++) {
ScopedTextureBinder<GL_TEXTURE_2D> texture_binder(gl_, dest_textures[t]);
gl_->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + t,
@@ -232,7 +232,7 @@ class ScalerImpl : public GLHelper::ScalerInterface,
GLuint intermediate_texture_;
scoped_refptr<ShaderProgram> shader_program_;
ScopedFramebuffer dst_framebuffer_;
- scoped_ptr<ScalerImpl> subscaler_;
+ std::unique_ptr<ScalerImpl> subscaler_;
};
GLHelperScaling::ScalerStage::ScalerStage(ShaderType shader_,
« no previous file with comments | « content/browser/compositor/gl_helper_benchmark.cc ('k') | content/browser/compositor/gl_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698