summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-14 20:35:51 +0000
committerasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-14 20:35:51 +0000
commit35b72aa58654d3dfe3feb09bef3541da61a2df85 (patch)
tree29724a2d523108357913d69450afd4791f502cb1 /content
parentd8e1c799c7722fd8903c625e369a42e8e9edc7fa (diff)
downloadchromium_src-35b72aa58654d3dfe3feb09bef3541da61a2df85.zip
chromium_src-35b72aa58654d3dfe3feb09bef3541da61a2df85.tar.gz
chromium_src-35b72aa58654d3dfe3feb09bef3541da61a2df85.tar.bz2
Revert 89054 - 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 TBR=gman@chromium.org Review URL: http://codereview.chromium.org/7150022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89067 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, 2 insertions, 5 deletions
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 0eb1243..92dec65 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,7 +527,6 @@ 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 20c9f0c3..3b5dad0 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -536,8 +536,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
switches::kEnableAdaptive,
switches::kEnableBenchmarking,
switches::kEnableDCHECK,
- switches::kEnableGPUServiceLogging,
- switches::kEnableGPUClientLogging,
switches::kEnableLogging,
switches::kEnableOpenMax,
#if defined(ENABLE_P2P_APIS)