Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Unified Diff: content/gpu/gpu_child_thread.cc

Issue 8692013: Improve GPU tests to fail when GPU drawing fails (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re-added DLOG Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_child_thread.cc
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index 02c38af3ed1de62d4a4b6167b979da47f3547c62..0141961ff94ed5c06576af4c12e4f947a9606f8b 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -103,12 +103,12 @@ void GpuChildThread::OnInitialize() {
!CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessGPU))
logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
+ // Always set gpu info and send it back, even if there's an error and it's
+ // impartially collected.
bool succeeded = gpu_info_collector::CollectGraphicsInfo(&gpu_info_);
-
- if (succeeded) {
- content::GetContentClient()->SetGpuInfo(gpu_info_);
- LOG(INFO) << "gpu_info_collector::CollectGraphicsInfo complete";
- }
+ content::GetContentClient()->SetGpuInfo(gpu_info_);
+ LOG(INFO) << "gpu_info_collector::CollectGraphicsInfo complete. success = " <<
+ succeeded;
// Record initialization only after collecting the GPU info because that can
// take a significant amount of time.
@@ -157,8 +157,7 @@ void GpuChildThread::OnInitialize() {
// Ensure the browser process receives the GPU info before a reply to any
// subsequent IPC it might send.
- if (succeeded)
- Send(new GpuHostMsg_GraphicsInfoCollected(gpu_info_));
+ Send(new GpuHostMsg_GraphicsInfoCollected(gpu_info_));
}
void GpuChildThread::StopWatchdog() {
« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698