diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 23:39:53 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 23:39:53 +0000 |
| commit | 8e1b98ae9ec5ebd3c94df444769ab2305ee587e5 (patch) | |
| tree | 3ca6bb6456efc26ba9b7df8b08f58761bb13bcb7 /content | |
| parent | 74c54b2d692fb1e86c7a882c10c12f0079e5743a (diff) | |
| download | chromium_src-8e1b98ae9ec5ebd3c94df444769ab2305ee587e5.zip chromium_src-8e1b98ae9ec5ebd3c94df444769ab2305ee587e5.tar.gz chromium_src-8e1b98ae9ec5ebd3c94df444769ab2305ee587e5.tar.bz2 | |
Fix Revert of 89054 so it builds on win_shared
TEST=builds on win_shared
BUG=none
Review URL: http://codereview.chromium.org/7167001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/gpu/gpu_process_host.cc | 5 | ||||
| -rw-r--r-- | content/browser/renderer_host/browser_render_process_host.cc | 2 |
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) |