| Index: content/gpu/gpu_child_thread.h
|
| diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
|
| index 853972be6f37eed44effa21fde8b6a5ef6fa5129..70aace9fac776dfc74e0de1823d351f58d867312 100644
|
| --- a/content/gpu/gpu_child_thread.h
|
| +++ b/content/gpu/gpu_child_thread.h
|
| @@ -32,6 +32,7 @@
|
|
|
| namespace gpu {
|
| class GpuMemoryBufferFactory;
|
| +class GpuWatchdogThread;
|
| class SyncPointManager;
|
| }
|
|
|
| @@ -45,7 +46,6 @@ class TargetServices;
|
|
|
| namespace content {
|
| class GpuServiceFactory;
|
| -class GpuWatchdogThread;
|
| struct EstablishChannelParams;
|
|
|
| // The main thread of the GPU child process. There will only ever be one of
|
| @@ -58,7 +58,7 @@ class GpuChildThread : public ChildThreadImpl,
|
| public:
|
| typedef std::queue<IPC::Message*> DeferredMessages;
|
|
|
| - GpuChildThread(GpuWatchdogThread* gpu_watchdog_thread,
|
| + GpuChildThread(gpu::GpuWatchdogThread* gpu_watchdog_thread,
|
| bool dead_on_arrival,
|
| const gpu::GPUInfo& gpu_info,
|
| const DeferredMessages& deferred_messages,
|
| @@ -138,7 +138,7 @@ class GpuChildThread : public ChildThreadImpl,
|
| // OnInitialize message, in which case we just declare ourselves DOA.
|
| bool dead_on_arrival_;
|
| base::Time process_start_time_;
|
| - scoped_refptr<GpuWatchdogThread> watchdog_thread_;
|
| + scoped_refptr<gpu::GpuWatchdogThread> watchdog_thread_;
|
|
|
| #if defined(OS_WIN)
|
| // Windows specific client sandbox interface.
|
|
|