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

Unified Diff: content/renderer/media/android/stream_texture_factory_impl.cc

Issue 1417853006: gpu: introduce glSetStreamTextureSizeCHROMIUM(GLuint texture, GLint stream_id, GLsizei width, GLsiz… Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android_webview.test failure Created 5 years, 1 month 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
Index: content/renderer/media/android/stream_texture_factory_impl.cc
diff --git a/content/renderer/media/android/stream_texture_factory_impl.cc b/content/renderer/media/android/stream_texture_factory_impl.cc
index a17531b2c91a35c97b4907e041e74192126602c3..e780ced671a45a0ae197ed3edb427215551fde44 100644
--- a/content/renderer/media/android/stream_texture_factory_impl.cc
+++ b/content/renderer/media/android/stream_texture_factory_impl.cc
@@ -140,11 +140,11 @@ void StreamTextureFactoryImpl::EstablishPeer(int32 stream_id, int player_id) {
new GpuStreamTextureMsg_EstablishPeer(stream_id, frame_id_, player_id));
}
-unsigned StreamTextureFactoryImpl::CreateStreamTexture(
+int32 StreamTextureFactoryImpl::CreateStreamTexture(
unsigned texture_target,
unsigned* texture_id,
gpu::Mailbox* texture_mailbox) {
- GLuint stream_id = 0;
+ int32 stream_id = 0;
gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
gl->GenTextures(1, texture_id);
@@ -156,11 +156,6 @@ unsigned StreamTextureFactoryImpl::CreateStreamTexture(
return stream_id;
}
-void StreamTextureFactoryImpl::SetStreamTextureSize(int32 stream_id,
- const gfx::Size& size) {
- channel_->Send(new GpuStreamTextureMsg_SetSize(stream_id, size));
-}
-
gpu::gles2::GLES2Interface* StreamTextureFactoryImpl::ContextGL() {
return context_provider_->ContextGL();
}

Powered by Google App Engine
This is Rietveld 408576698