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

Unified Diff: gpu/ipc/service/stream_texture_android.cc

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « gpu/ipc/service/stream_texture_android.h ('k') | gpu/perftests/measurements.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/stream_texture_android.cc
diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc
index fd4be1713707771537cb3902a19f92956f577353..49ad894acc0d18cfaf7f6dcc67d4b5ecf93eac23 100644
--- a/gpu/ipc/service/stream_texture_android.cc
+++ b/gpu/ipc/service/stream_texture_android.cc
@@ -100,7 +100,8 @@ void StreamTexture::OnWillDestroyStub() {
owner_stub_->channel()->RemoveRoute(route_id_);
if (framebuffer_) {
- scoped_ptr<ui::ScopedMakeCurrent> scoped_make_current(MakeStubCurrent());
+ std::unique_ptr<ui::ScopedMakeCurrent> scoped_make_current(
+ MakeStubCurrent());
glDeleteProgram(program_);
glDeleteShader(vertex_shader_);
@@ -126,8 +127,8 @@ void StreamTexture::Destroy(bool have_context) {
NOTREACHED();
}
-scoped_ptr<ui::ScopedMakeCurrent> StreamTexture::MakeStubCurrent() {
- scoped_ptr<ui::ScopedMakeCurrent> scoped_make_current;
+std::unique_ptr<ui::ScopedMakeCurrent> StreamTexture::MakeStubCurrent() {
+ std::unique_ptr<ui::ScopedMakeCurrent> scoped_make_current;
bool needs_make_current =
!owner_stub_->decoder()->GetGLContext()->IsCurrent(NULL);
if (needs_make_current) {
@@ -143,7 +144,7 @@ void StreamTexture::UpdateTexImage() {
if (!has_pending_frame_) return;
- scoped_ptr<ui::ScopedMakeCurrent> scoped_make_current(MakeStubCurrent());
+ std::unique_ptr<ui::ScopedMakeCurrent> scoped_make_current(MakeStubCurrent());
surface_texture_->UpdateTexImage();
« no previous file with comments | « gpu/ipc/service/stream_texture_android.h ('k') | gpu/perftests/measurements.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698