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

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

Issue 10978004: Upstream the code to pass StreamTextureManagerAndroid from GpuChannel to GLES2DecoderImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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/common/gpu/gpu_channel.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_command_buffer_stub.cc
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index 99d053fbb12ae502bbc8e1fa95dfbdae7492e232..666144744ea6ac5ab6f0f317c06e7c19474dc3d7 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -33,6 +33,10 @@
#include "content/public/common/sandbox_init.h"
#endif
+#if defined(OS_ANDROID)
+#include "content/common/gpu/stream_texture_manager_android.h"
+#endif
+
namespace {
// The GpuCommandBufferMemoryTracker class provides a bridge between the
@@ -448,6 +452,10 @@ void GpuCommandBufferStub::OnInitialize(
base::Unretained(this)));
}
+#if defined(OS_ANDROID)
+ decoder_->SetStreamTextureManager(channel_->stream_texture_manager());
+#endif
+
if (parent_stub_for_initialization_) {
decoder_->SetParent(parent_stub_for_initialization_->decoder_.get(),
parent_texture_for_initialization_);
« no previous file with comments | « content/common/gpu/gpu_channel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698