diff options
| author | dcheng <dcheng@chromium.org> | 2014-10-06 21:14:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 04:15:17 +0000 |
| commit | 165763c20c375201e93c5663f6b1fc0834503747 (patch) | |
| tree | c4428a19dd281c2b9c9a8af817f664302cd6db88 /content/common/gpu/stream_texture_android.cc | |
| parent | c53c0289d86a263c3446b3c89779612502682a01 (diff) | |
| download | chromium_src-165763c20c375201e93c5663f6b1fc0834503747.zip chromium_src-165763c20c375201e93c5663f6b1fc0834503747.tar.gz chromium_src-165763c20c375201e93c5663f6b1fc0834503747.tar.bz2 | |
Remove implicit conversions from scoped_refptr to T* in content/
This patch was generated by running the rewrite_scoped_refptr clang tool
on an Android build.
BUG=110610
Review URL: https://codereview.chromium.org/628333003
Cr-Commit-Position: refs/heads/master@{#298364}
Diffstat (limited to 'content/common/gpu/stream_texture_android.cc')
| -rw-r--r-- | content/common/gpu/stream_texture_android.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/common/gpu/stream_texture_android.cc b/content/common/gpu/stream_texture_android.cc index 0c3173e..eb7f3bb 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); } |