| Index: content/common/gpu/gpu_channel.h
|
| ===================================================================
|
| --- content/common/gpu/gpu_channel.h (revision 163290)
|
| +++ content/common/gpu/gpu_channel.h (working copy)
|
| @@ -28,9 +28,7 @@
|
| #include "content/common/android/surface_texture_peer.h"
|
| #endif
|
|
|
| -class GpuChannelManager;
|
| struct GPUCreateCommandBufferConfig;
|
| -class GpuWatchdog;
|
|
|
| namespace base {
|
| class MessageLoopProxy;
|
| @@ -50,6 +48,10 @@
|
| }
|
| #endif
|
|
|
| +namespace content {
|
| +class GpuChannelManager;
|
| +class GpuWatchdog;
|
| +
|
| // Encapsulates an IPC channel between the GPU process and one renderer
|
| // process. On the renderer side there's a corresponding GpuChannelHost.
|
| class GpuChannel : public IPC::Listener,
|
| @@ -135,7 +137,7 @@
|
| scoped_refptr<gpu::RefCountedCounter> preempt_by_counter);
|
|
|
| #if defined(OS_ANDROID)
|
| - content::StreamTextureManagerAndroid* stream_texture_manager() {
|
| + StreamTextureManagerAndroid* stream_texture_manager() {
|
| return stream_texture_manager_.get();
|
| }
|
| #endif
|
| @@ -168,7 +170,7 @@
|
| // Create a java surface texture object and send it to the renderer process
|
| // through binder thread.
|
| void OnEstablishStreamTexture(
|
| - int32 stream_id, content::SurfaceTexturePeer::SurfaceTextureTarget type,
|
| + int32 stream_id, SurfaceTexturePeer::SurfaceTextureTarget type,
|
| int32 primary_id, int32 secondary_id);
|
| #endif
|
|
|
| @@ -222,7 +224,7 @@
|
| bool processed_get_state_fast_;
|
|
|
| #if defined(OS_ANDROID)
|
| - scoped_ptr<content::StreamTextureManagerAndroid> stream_texture_manager_;
|
| + scoped_ptr<StreamTextureManagerAndroid> stream_texture_manager_;
|
| #endif
|
|
|
| base::WeakPtrFactory<GpuChannel> weak_factory_;
|
| @@ -230,4 +232,6 @@
|
| DISALLOW_COPY_AND_ASSIGN(GpuChannel);
|
| };
|
|
|
| +} // namespace content
|
| +
|
| #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_H_
|
|
|