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

Unified Diff: content/renderer/media/android/stream_texture_factory_synchronous_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_synchronous_impl.cc
diff --git a/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc b/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc
index d92d3ab876f14bc34b9d7005ae12b939f965eb16..56d9da795bed5b6aa601cdb5fc1a9b727115df77 100644
--- a/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc
+++ b/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc
@@ -192,12 +192,12 @@ void StreamTextureFactorySynchronousImpl::EstablishPeer(int32 stream_id,
}
}
-unsigned StreamTextureFactorySynchronousImpl::CreateStreamTexture(
+int32 StreamTextureFactorySynchronousImpl::CreateStreamTexture(
unsigned texture_target,
unsigned* texture_id,
gpu::Mailbox* texture_mailbox) {
DCHECK(context_provider_.get());
- unsigned stream_id = 0;
+ int32 stream_id = 0;
GLES2Interface* gl = context_provider_->ContextGL();
gl->GenTextures(1, texture_id);
stream_id = gl->CreateStreamTextureCHROMIUM(*texture_id);
@@ -208,10 +208,6 @@ unsigned StreamTextureFactorySynchronousImpl::CreateStreamTexture(
return stream_id;
}
-void StreamTextureFactorySynchronousImpl::SetStreamTextureSize(
- int32 stream_id,
- const gfx::Size& size) {}
-
gpu::gles2::GLES2Interface* StreamTextureFactorySynchronousImpl::ContextGL() {
DCHECK(context_provider_.get());
return context_provider_->ContextGL();

Powered by Google App Engine
This is Rietveld 408576698