diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 00:12:55 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 00:12:55 +0000 |
| commit | a0401380072097ae9a3b34ed900299f26ef9bf6d (patch) | |
| tree | 1863e20cfb1b55649c91850e545043e6f26fe5d2 /content/browser/gpu/gpu_process_host.cc | |
| parent | 858ddc0adbeb9fb56a5ea54aed4b488258cb3851 (diff) | |
| download | chromium_src-a0401380072097ae9a3b34ed900299f26ef9bf6d.zip chromium_src-a0401380072097ae9a3b34ed900299f26ef9bf6d.tar.gz chromium_src-a0401380072097ae9a3b34ed900299f26ef9bf6d.tar.bz2 | |
Provide a reason why GPU access is blocked.
This provides better information in about:gpu, which helps us to better diagnose GPU feature failures.
Also, move the gpu access blocked message to the top as this is the most important message as compared with individual blacklist entry messages.
BUG=237393
TEST=about:gpu shows gpu process fails to launch because of settings where gpu is turned off
R=joi@chromium.org, kbr@chromium.org, sky@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/14697014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_process_host.cc')
| -rw-r--r-- | content/browser/gpu/gpu_process_host.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index fa88129..560fed2a 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -347,7 +347,7 @@ GpuProcessHost* GpuProcessHost::Get(GpuProcessKind kind, // Don't grant further access to GPU if it is not allowed. GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance(); DCHECK(gpu_data_manager); - if (!gpu_data_manager->GpuAccessAllowed()) + if (!gpu_data_manager->GpuAccessAllowed(NULL)) return NULL; if (g_gpu_process_hosts[kind] && ValidateHost(g_gpu_process_hosts[kind])) @@ -705,7 +705,7 @@ void GpuProcessHost::EstablishGpuChannel( TRACE_EVENT0("gpu", "GpuProcessHost::EstablishGpuChannel"); // If GPU features are already blacklisted, no need to establish the channel. - if (!GpuDataManagerImpl::GetInstance()->GpuAccessAllowed()) { + if (!GpuDataManagerImpl::GetInstance()->GpuAccessAllowed(NULL)) { callback.Run(IPC::ChannelHandle(), GPUInfo()); return; } @@ -791,7 +791,7 @@ void GpuProcessHost::OnChannelEstablished( // Currently if any of the GPU features are blacklisted, we don't establish a // GPU channel. if (!channel_handle.name.empty() && - !GpuDataManagerImpl::GetInstance()->GpuAccessAllowed()) { + !GpuDataManagerImpl::GetInstance()->GpuAccessAllowed(NULL)) { Send(new GpuMsg_CloseChannel(channel_handle)); callback.Run(IPC::ChannelHandle(), GPUInfo()); RouteOnUIThread(GpuHostMsg_OnLogMessage( |