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

Unified Diff: content/common/gpu/stream_texture_android.cc

Issue 628333003: Remove implicit conversions from scoped_refptr to T* in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/web_contents/web_contents_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/stream_texture_android.cc
diff --git a/content/common/gpu/stream_texture_android.cc b/content/common/gpu/stream_texture_android.cc
index 0c3173ec2f952df661e3cb48f5b69434c66c1450..eb7f3bbe32bfb9071cdc5e41e4495271c3c3a885 100644
--- a/content/common/gpu/stream_texture_android.cc
+++ b/content/common/gpu/stream_texture_android.cc
@@ -53,7 +53,7 @@ bool StreamTexture::Create(
GL_UNSIGNED_BYTE,
true);
texture_manager->SetLevelImage(
- texture, GL_TEXTURE_EXTERNAL_OES, 0, gl_image);
+ texture, GL_TEXTURE_EXTERNAL_OES, 0, gl_image.get());
return true;
}
@@ -131,7 +131,7 @@ void StreamTexture::WillUseTexImage() {
const gpu::gles2::TextureUnit& active_unit =
state->texture_units[state->active_texture_unit];
glBindTexture(GL_TEXTURE_EXTERNAL_OES,
- active_unit.bound_texture_external_oes
+ active_unit.bound_texture_external_oes.get()
? active_unit.bound_texture_external_oes->service_id()
: 0);
}
« no previous file with comments | « content/browser/web_contents/web_contents_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698