| Index: content/common/gpu/gpu_channel.h
|
| diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h
|
| index 8d775f095fd28f23e43ddcc4ed7a6ab60d5564c7..21631d79a40e2290c66b3365c0b86bafb86f4298 100644
|
| --- a/content/common/gpu/gpu_channel.h
|
| +++ b/content/common/gpu/gpu_channel.h
|
| @@ -23,10 +23,6 @@
|
| #include "ui/gl/gl_share_group.h"
|
| #include "ui/gl/gpu_preference.h"
|
|
|
| -#if defined(OS_ANDROID)
|
| -#include "content/common/android/surface_texture_peer.h"
|
| -#endif
|
| -
|
| struct GPUCreateCommandBufferConfig;
|
|
|
| namespace base {
|
| @@ -41,12 +37,6 @@ class ImageManager;
|
| }
|
| }
|
|
|
| -#if defined(OS_ANDROID)
|
| -namespace content {
|
| -class StreamTextureManagerAndroid;
|
| -}
|
| -#endif
|
| -
|
| namespace content {
|
| class GpuChannelManager;
|
| struct GpuRenderingStats;
|
| @@ -146,12 +136,6 @@ class GpuChannel : public IPC::Listener,
|
| void SetPreemptByFlag(
|
| scoped_refptr<gpu::PreemptionFlag> preemption_flag);
|
|
|
| -#if defined(OS_ANDROID)
|
| - StreamTextureManagerAndroid* stream_texture_manager() {
|
| - return stream_texture_manager_.get();
|
| - }
|
| -#endif
|
| -
|
| void CacheShader(const std::string& key, const std::string& shader);
|
|
|
| protected:
|
| @@ -229,9 +213,6 @@ class GpuChannel : public IPC::Listener,
|
|
|
| scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
|
| scoped_refptr<gpu::gles2::ImageManager> image_manager_;
|
| -#if defined(OS_ANDROID)
|
| - scoped_ptr<StreamTextureManagerAndroid> stream_texture_manager_;
|
| -#endif
|
|
|
| #if defined(ENABLE_GPU)
|
| typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap;
|
|
|