Fix sending log messages from GPU child threads

content/gpu/gpu_child_thread.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/gpu/gpu_child_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
 #include "content/common/child_process.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/gpu/gpu_info_collector.h"
 #include "content/gpu/gpu_watchdog_thread.h"
 #include "ipc/ipc_channel_handle.h"
+#include "ipc/ipc_sync_message_filter.h"
 #include "ui/gfx/gl/gl_implementation.h"
 
 const int kGpuTimeout = 10000;
 
 namespace {
 
 bool GpuProcessLogMessageHandler(int severity,
                                  const char* file, int line,
                                  size_t message_start,
                                  const std::string& str) {
   std::string header = str.substr(0, message_start);
   std::string message = str.substr(message_start);
-  ChildThread::current()->Send(
+
+  // If we are not on main thread in child process, send through
+  // the sync_message_filter; otherwise send directly.
+  if (MessageLoop::current() !=
+      ChildProcess::current()->main_thread()->message_loop())

[apatrick_chromium, 2012/03/21 22:38:17]

nit: we'd typically give this if-else braces since it spans so many lines.

+    ChildProcess::current()->main_thread()->sync_message_filter()->Send(
       new GpuHostMsg_OnLogMessage(severity, header, message));

[apatrick_chromium, 2012/03/21 22:38:17]

nit: indent out by two spaces on this line.

+  else
+    ChildThread::current()->Send(
+      new GpuHostMsg_OnLogMessage(severity, header, message));

[apatrick_chromium, 2012/03/21 22:38:17]

... and this one.

+
   return false;
 }
 
 }  // namespace
 
 GpuChildThread::GpuChildThread(bool dead_on_arrival,
                                const content::GPUInfo& gpu_info)
     : dead_on_arrival_(dead_on_arrival),
       gpu_info_(gpu_info) {
 #if defined(OS_WIN)
@@ skipping 182 matching lines @@
 // Runs on the main thread.
 void GpuChildThread::SetDxDiagnostics(GpuChildThread* thread,
                                       const content::DxDiagNode& node) {
   thread->gpu_info_.dx_diagnostics = node;
   thread->gpu_info_.finalized = true;
   thread->collecting_dx_diagnostics_ = false;
   thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_));
 }
 
 #endif