| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "content/gpu/gpu_child_thread.h" | 5 #include "content/gpu/gpu_child_thread.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 ChildThread::current()->Send( | 34 ChildThread::current()->Send( |
| 35 new GpuHostMsg_OnLogMessage(severity, header, message)); | 35 new GpuHostMsg_OnLogMessage(severity, header, message)); |
| 36 return false; | 36 return false; |
| 37 } | 37 } |
| 38 | 38 |
| 39 } // namespace | 39 } // namespace |
| 40 | 40 |
| 41 GpuChildThread::GpuChildThread(bool dead_on_arrival) | 41 GpuChildThread::GpuChildThread(bool dead_on_arrival) |
| 42 : dead_on_arrival_(dead_on_arrival) { | 42 : dead_on_arrival_(dead_on_arrival) { |
| 43 #if defined(OS_WIN) | 43 #if defined(OS_WIN) |
| 44 target_services_ = NULL; |
| 44 collecting_dx_diagnostics_ = false; | 45 collecting_dx_diagnostics_ = false; |
| 45 #endif | 46 #endif |
| 46 } | 47 } |
| 47 | 48 |
| 48 GpuChildThread::GpuChildThread(const std::string& channel_id) | 49 GpuChildThread::GpuChildThread(const std::string& channel_id) |
| 49 : ChildThread(channel_id), | 50 : ChildThread(channel_id), |
| 50 dead_on_arrival_(false) { | 51 dead_on_arrival_(false) { |
| 51 #if defined(OS_WIN) | 52 #if defined(OS_WIN) |
| 52 target_services_ = NULL; | 53 target_services_ = NULL; |
| 53 collecting_dx_diagnostics_ = false; | 54 collecting_dx_diagnostics_ = false; |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 // Runs on the main thread. | 229 // Runs on the main thread. |
| 229 void GpuChildThread::SetDxDiagnostics(GpuChildThread* thread, | 230 void GpuChildThread::SetDxDiagnostics(GpuChildThread* thread, |
| 230 const content::DxDiagNode& node) { | 231 const content::DxDiagNode& node) { |
| 231 thread->gpu_info_.dx_diagnostics = node; | 232 thread->gpu_info_.dx_diagnostics = node; |
| 232 thread->gpu_info_.finalized = true; | 233 thread->gpu_info_.finalized = true; |
| 233 thread->collecting_dx_diagnostics_ = false; | 234 thread->collecting_dx_diagnostics_ = false; |
| 234 thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_)); | 235 thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_)); |
| 235 } | 236 } |
| 236 | 237 |
| 237 #endif | 238 #endif |
| OLD | NEW |