diff options
| author | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 19:45:21 +0000 |
|---|---|---|
| committer | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 19:45:21 +0000 |
| commit | 97e231fcaa8e94fe5dc2900236fcc3e1626d79e5 (patch) | |
| tree | 513c07e19b692aaee87e61d5ae16a13ec2500001 /content/browser/gpu/gpu_data_manager_impl.cc | |
| parent | 01edb1b5cc9b6eb7b5cc9db3662ce16bce2d27b7 (diff) | |
| download | chromium_src-97e231fcaa8e94fe5dc2900236fcc3e1626d79e5.zip chromium_src-97e231fcaa8e94fe5dc2900236fcc3e1626d79e5.tar.gz chromium_src-97e231fcaa8e94fe5dc2900236fcc3e1626d79e5.tar.bz2 | |
Revert 184995
Looks to have caused the broken tests in http://build.chromium.org/p/chromium.win/builders/Vista%20Tests%20%282%29/builds/32494
> Make sure if GPU process fails to launch, all observers waiting for full gpu info get a response.
>
> BUG=174296
> TEST=AutofillRiskFingerprintTest.GetFingerprint
> Review URL: https://codereview.chromium.org/12335100
TBR=zmo@chromium.org
Review URL: https://codereview.chromium.org/12310178
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_data_manager_impl.cc')
| -rw-r--r-- | content/browser/gpu/gpu_data_manager_impl.cc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc index 098ab732..834bf55 100644 --- a/content/browser/gpu/gpu_data_manager_impl.cc +++ b/content/browser/gpu/gpu_data_manager_impl.cc @@ -136,7 +136,7 @@ bool GpuDataManagerImpl::GpuAccessAllowed() const { if (software_rendering_) return true; - if (!gpu_process_accessible_) + if (!gpu_info_.gpu_accessible) return false; if (card_blacklisted_) @@ -592,8 +592,7 @@ GpuDataManagerImpl::GpuDataManagerImpl() card_blacklisted_(false), update_histograms_(true), window_count_(0), - domain_blocking_enabled_(true), - gpu_process_accessible_(true) { + domain_blocking_enabled_(true) { CommandLine* command_line = CommandLine::ForCurrentProcess(); if (command_line->HasSwitch(switches::kDisableAcceleratedCompositing)) { command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas); @@ -804,17 +803,4 @@ void GpuDataManagerImpl::Notify3DAPIBlocked(const GURL& url, url, render_process_id, render_view_id, requester); } -void GpuDataManagerImpl::OnGpuProcessInitFailure() { - gpu_process_accessible_ = false; - - GPUInfo gpu_info; - { - base::AutoLock auto_lock(gpu_info_lock_); - gpu_info = gpu_info_; - } - gpu_info.finalized = true; - // Need to call UpdateGpuInfo() - some observers might be waiting. - UpdateGpuInfo(gpu_info); -} - } // namespace content |