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

Unified Diff: content/common/gpu/gpu_channel.h

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 | « no previous file | content/common/gpu/gpu_command_buffer_stub.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_channel.h
diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h
index 12ede695f06002cedc48bf614884654d21da7218..867c4ce8434645856a9c836a780bc7f90e0f9238 100644
--- a/content/common/gpu/gpu_channel.h
+++ b/content/common/gpu/gpu_channel.h
@@ -125,6 +125,12 @@ class GpuChannel : public IPC::Listener,
void SetPreemptByCounter(
scoped_refptr<gpu::RefCountedCounter> preempt_by_counter);
+#if defined(OS_ANDROID)
+ content::StreamTextureManagerAndroid* stream_texture_manager() {
+ return stream_texture_manager_.get();
+ }
+#endif
+
protected:
virtual ~GpuChannel();
« no previous file with comments | « no previous file | content/common/gpu/gpu_command_buffer_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698