summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/browser/gpu/gpu_process_host.cc5
-rw-r--r--content/browser/renderer_host/browser_render_process_host.cc2
2 files changed, 5 insertions, 2 deletions
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 92dec65..0eb1243 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -198,7 +198,7 @@ GpuProcessHost* GpuProcessHost::GetForRenderer(
return NULL;
}
-// static
+// static
void GpuProcessHost::SendOnIO(int renderer_id,
content::CauseForGpuLaunch cause,
IPC::Message* message) {
@@ -414,7 +414,7 @@ void GpuProcessHost::OnChannelEstablished(
GPUInfo());
RouteOnUIThread(GpuHostMsg_OnLogMessage(
logging::LOG_WARNING,
- "WARNING",
+ "WARNING",
"Hardware acceleration is unavailable."));
return;
}
@@ -527,6 +527,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
switches::kDisableGpuVsync,
switches::kDisableGpuWatchdog,
switches::kDisableLogging,
+ switches::kEnableGPUServiceLogging,
switches::kEnableLogging,
#if defined(OS_MACOSX)
switches::kEnableSandboxLogging,
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc
index f30ae78..a531872 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -536,6 +536,8 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
switches::kEnableAdaptive,
switches::kEnableBenchmarking,
switches::kEnableDCHECK,
+ switches::kEnableGPUServiceLogging,
+ switches::kEnableGPUClientLogging,
switches::kEnableLogging,
switches::kEnableOpenMax,
#if defined(ENABLE_P2P_APIS)