Index: content/common/gpu/client/gpu_channel_host.h |
=================================================================== |
--- content/common/gpu/client/gpu_channel_host.h (revision 163290) |
+++ content/common/gpu/client/gpu_channel_host.h (working copy) |
@@ -28,24 +28,23 @@ |
#include "ui/gl/gpu_preference.h" |
class CommandBufferProxy; |
-class CommandBufferProxyImpl; |
-struct GPUCreateCommandBufferConfig; |
class GURL; |
+class MessageLoop; |
class TransportTextureService; |
-class MessageLoop; |
+struct GPUCreateCommandBufferConfig; |
namespace base { |
class MessageLoopProxy; |
} |
-namespace content { |
-struct GpuRenderingStats; |
-} |
- |
namespace IPC { |
class SyncMessageFilter; |
} |
+namespace content { |
+class CommandBufferProxyImpl; |
+struct GpuRenderingStats; |
+ |
struct GpuListenerInfo { |
GpuListenerInfo(); |
~GpuListenerInfo(); |
@@ -68,8 +67,7 @@ |
virtual scoped_ptr<base::SharedMemory> AllocateSharedMemory(uint32 size) = 0; |
virtual int32 CreateViewCommandBuffer( |
int32 surface_id, const GPUCreateCommandBufferConfig& init_params) = 0; |
- virtual GpuChannelHost* EstablishGpuChannelSync( |
- content::CauseForGpuLaunch) = 0; |
+ virtual GpuChannelHost* EstablishGpuChannelSync(CauseForGpuLaunch) = 0; |
virtual void CreateImage( |
gfx::PluginWindowHandle window, |
int32 image_id, |
@@ -106,8 +104,8 @@ |
void SetStateLost(); |
// The GPU stats reported by the GPU process. |
- void set_gpu_info(const content::GPUInfo& gpu_info); |
- const content::GPUInfo& gpu_info() const; |
+ void set_gpu_info(const GPUInfo& gpu_info); |
+ const GPUInfo& gpu_info() const; |
void OnChannelError(); |
@@ -144,7 +142,7 @@ |
// Collect rendering stats from GPU process. |
bool CollectRenderingStatsForSurface( |
- int surface_id, content::GpuRenderingStats* stats); |
+ int surface_id, GpuRenderingStats* stats); |
// Add a route for the current message loop. |
void AddRoute(int route_id, base::WeakPtr<IPC::Listener> listener); |
@@ -189,7 +187,7 @@ |
State state_; |
- content::GPUInfo gpu_info_; |
+ GPUInfo gpu_info_; |
scoped_ptr<IPC::SyncChannel> channel_; |
scoped_refptr<MessageFilter> channel_filter_; |
@@ -208,4 +206,6 @@ |
DISALLOW_COPY_AND_ASSIGN(GpuChannelHost); |
}; |
+} // namespace content |
+ |
#endif // CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_ |