Trace_event upgrades

chrome/browser/gpu_process_host_ui_shim.cc

 // Copyright (c) 2010 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 "chrome/browser/gpu_process_host_ui_shim.h"
 
 #include "app/app_switches.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/command_line.h"
+#include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/gpu_blacklist.h"
 #include "chrome/browser/gpu_process_host.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gpu_messages.h"
@@ skipping 235 matching lines @@
     CreateCommandBufferError(wrapped_callback.release(), MSG_ROUTING_NONE);
   }
 }
 
 void GpuProcessHostUIShim::CollectGraphicsInfoAsynchronously(
     GPUInfo::Level level) {
   DCHECK(CalledOnValidThread());
   Send(new GpuMsg_CollectGraphicsInfo(level));
 }
 
+void GpuProcessHostUIShim::OnTraceDataCollectedRemotely(
+    const std::string& json_events) {
+  base::debug::TraceLog::GetInstance()->AddRemotelyCollectedData(json_events);
+}
+
+void GpuProcessHostUIShim::SetTraceEnabled(bool enabled) {
+  DCHECK(CalledOnValidThread());
+
+  BrowserThread::PostTask(
+      BrowserThread::IO,
+      FROM_HERE,
+      new SendOnIOThreadTask(new GpuMsg_SetTraceEnabled(enabled)));
+}
+
 void GpuProcessHostUIShim::SendAboutGpuCrash() {
   DCHECK(CalledOnValidThread());
   Send(new GpuMsg_Crash());
 }
 
 void GpuProcessHostUIShim::SendAboutGpuHang() {
   DCHECK(CalledOnValidThread());
   Send(new GpuMsg_Hang());
 }
 
@@ skipping 18 matching lines @@
     IPC_MESSAGE_HANDLER(GpuHostMsg_CommandBufferCreated,
                         OnCommandBufferCreated)
     IPC_MESSAGE_HANDLER(GpuHostMsg_DestroyCommandBuffer,
                         OnDestroyCommandBuffer)
     IPC_MESSAGE_HANDLER(GpuHostMsg_GraphicsInfoCollected,
                         OnGraphicsInfoCollected)
     IPC_MESSAGE_HANDLER(GpuHostMsg_OnLogMessage,
                         OnLogMessage)
     IPC_MESSAGE_HANDLER(GpuHostMsg_SynchronizeReply,
                         OnSynchronizeReply)
+    IPC_MESSAGE_HANDLER(GpuHostMsg_TraceDataCollectedRemotely,
+                        OnTraceDataCollectedRemotely)
 #if defined(OS_LINUX)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuHostMsg_ResizeXID, OnResizeXID)
 #elif defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceSetIOSurface,
                         OnAcceleratedSurfaceSetIOSurface)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
                         OnAcceleratedSurfaceBuffersSwapped)
 #elif defined(OS_WIN)
     IPC_MESSAGE_HANDLER(GpuHostMsg_ScheduleComposite, OnScheduleComposite);
 #endif
@@ skipping 192 matching lines @@
     return true;
   static const base::StringPiece gpu_blacklist_json(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_GPU_BLACKLIST));
   gpu_blacklist_.reset(new GpuBlacklist());
   if (gpu_blacklist_->LoadGpuBlacklist(gpu_blacklist_json.as_string(), true))
     return true;
   gpu_blacklist_.reset(NULL);
   return false;
 }