| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_GPU_GPU_CHILD_THREAD_H_ | 5 #ifndef CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| 6 #define CONTENT_GPU_GPU_CHILD_THREAD_H_ | 6 #define CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE; | 50 virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE; |
| 51 | 51 |
| 52 private: | 52 private: |
| 53 // Message handlers. | 53 // Message handlers. |
| 54 void OnInitialize(); | 54 void OnInitialize(); |
| 55 void OnCollectGraphicsInfo(); | 55 void OnCollectGraphicsInfo(); |
| 56 void OnClean(); | 56 void OnClean(); |
| 57 void OnCrash(); | 57 void OnCrash(); |
| 58 void OnHang(); | 58 void OnHang(); |
| 59 | 59 |
| 60 #if defined(USE_TCMALLOC) |
| 61 void OnGetGpuTcmalloc(); |
| 62 #endif |
| 63 |
| 60 #if defined(OS_WIN) | 64 #if defined(OS_WIN) |
| 61 static void CollectDxDiagnostics(GpuChildThread* thread); | 65 static void CollectDxDiagnostics(GpuChildThread* thread); |
| 62 static void SetDxDiagnostics(GpuChildThread* thread, | 66 static void SetDxDiagnostics(GpuChildThread* thread, |
| 63 const content::DxDiagNode& node); | 67 const content::DxDiagNode& node); |
| 64 #endif | 68 #endif |
| 65 | 69 |
| 66 // Set this flag to true if a fatal error occurred before we receive the | 70 // Set this flag to true if a fatal error occurred before we receive the |
| 67 // OnInitialize message, in which case we just declare ourselves DOA. | 71 // OnInitialize message, in which case we just declare ourselves DOA. |
| 68 bool dead_on_arrival_; | 72 bool dead_on_arrival_; |
| 69 base::Time process_start_time_; | 73 base::Time process_start_time_; |
| 70 scoped_refptr<GpuWatchdogThread> watchdog_thread_; | 74 scoped_refptr<GpuWatchdogThread> watchdog_thread_; |
| 71 | 75 |
| 72 #if defined(OS_WIN) | 76 #if defined(OS_WIN) |
| 73 // Windows specific client sandbox interface. | 77 // Windows specific client sandbox interface. |
| 74 sandbox::TargetServices* target_services_; | 78 sandbox::TargetServices* target_services_; |
| 75 | 79 |
| 76 // Indicates whether DirectX Diagnostics collection is ongoing. | 80 // Indicates whether DirectX Diagnostics collection is ongoing. |
| 77 bool collecting_dx_diagnostics_; | 81 bool collecting_dx_diagnostics_; |
| 78 #endif | 82 #endif |
| 79 | 83 |
| 80 scoped_ptr<GpuChannelManager> gpu_channel_manager_; | 84 scoped_ptr<GpuChannelManager> gpu_channel_manager_; |
| 81 | 85 |
| 82 // Information about the GPU, such as device and vendor ID. | 86 // Information about the GPU, such as device and vendor ID. |
| 83 content::GPUInfo gpu_info_; | 87 content::GPUInfo gpu_info_; |
| 84 | 88 |
| 85 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); | 89 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); |
| 86 }; | 90 }; |
| 87 | 91 |
| 88 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ | 92 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| OLD | NEW |