summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-14 20:06:57 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-14 20:06:57 +0000
commit87ad26d05ee0e7b31211e6e9b0c06d6dd62c086a (patch)
tree0f9fe2342769c8072ca29651d6cb97bb5f195600 /content
parentde059efb30d6ae2f62f2dbd10d1550b56f30a433 (diff)
downloadchromium_src-87ad26d05ee0e7b31211e6e9b0c06d6dd62c086a.zip
chromium_src-87ad26d05ee0e7b31211e6e9b0c06d6dd62c086a.tar.gz
chromium_src-87ad26d05ee0e7b31211e6e9b0c06d6dd62c086a.tar.bz2
Add lots of client side OpenGL logging.
TEST=ran chrome, ran OpenGL ES 2.0 conformance tests BUG=none R=apatrick@chromium.org Review URL: http://codereview.chromium.org/7003103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89054 0039d316-1c4b-4281-b951-d872f2087c98
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 3b5dad0..20c9f0c3 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)