| 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 "app/gfx/gl/gl_context.h" | 10 #include "app/gfx/gl/gl_context.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 } | 64 } |
| 65 #else | 65 #else |
| 66 GpuChildThread::GpuChildThread() { | 66 GpuChildThread::GpuChildThread() { |
| 67 } | 67 } |
| 68 #endif | 68 #endif |
| 69 | 69 |
| 70 GpuChildThread::GpuChildThread(const std::string& channel_id) | 70 GpuChildThread::GpuChildThread(const std::string& channel_id) |
| 71 : ChildThread(channel_id) { | 71 : ChildThread(channel_id) { |
| 72 #if defined(OS_WIN) | 72 #if defined(OS_WIN) |
| 73 target_services_ = NULL; | 73 target_services_ = NULL; |
| 74 collecting_dx_diagnostics_ = false; |
| 74 #endif | 75 #endif |
| 75 } | 76 } |
| 76 | 77 |
| 77 | 78 |
| 78 GpuChildThread::~GpuChildThread() { | 79 GpuChildThread::~GpuChildThread() { |
| 79 logging::SetLogMessageHandler(NULL); | 80 logging::SetLogMessageHandler(NULL); |
| 80 } | 81 } |
| 81 | 82 |
| 82 void GpuChildThread::Init(const base::Time& process_start_time) { | 83 void GpuChildThread::Init(const base::Time& process_start_time) { |
| 83 process_start_time_ = process_start_time; | 84 process_start_time_ = process_start_time; |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 // Runs on the main thread. | 262 // Runs on the main thread. |
| 262 void GpuChildThread::SetDxDiagnostics(GpuChildThread* thread, | 263 void GpuChildThread::SetDxDiagnostics(GpuChildThread* thread, |
| 263 const DxDiagNode& node) { | 264 const DxDiagNode& node) { |
| 264 thread->gpu_info_.dx_diagnostics = node; | 265 thread->gpu_info_.dx_diagnostics = node; |
| 265 thread->gpu_info_.finalized = true; | 266 thread->gpu_info_.finalized = true; |
| 266 thread->collecting_dx_diagnostics_ = false; | 267 thread->collecting_dx_diagnostics_ = false; |
| 267 thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_)); | 268 thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_)); |
| 268 } | 269 } |
| 269 | 270 |
| 270 #endif | 271 #endif |
| OLD | NEW |