diff options
| author | engedy@chromium.org <engedy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 13:39:48 +0000 |
|---|---|---|
| committer | engedy@chromium.org <engedy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 13:39:48 +0000 |
| commit | 3ba2e2534aad6e7138bbe70be87de41a45ac1886 (patch) | |
| tree | 5bb3f80db1d29492c80b20aaea43843a892edcac /components/autofill/content | |
| parent | 81c8ad4d47a96b5be45cda2b1040eb2afb28c947 (diff) | |
| download | chromium_src-3ba2e2534aad6e7138bbe70be87de41a45ac1886.zip chromium_src-3ba2e2534aad6e7138bbe70be87de41a45ac1886.tar.gz chromium_src-3ba2e2534aad6e7138bbe70be87de41a45ac1886.tar.bz2 | |
Revert 258541 "Don't attempt to query GPU info for blacklisted G..."
> Don't attempt to query GPU info for blacklisted GPUs.
>
> GPU info is not available for blacklisted GPUs, so don't try to query for it.
> This prevents the fingerprinter code from needlessly waiting for the timeout
> timer to fire in this case.
>
> BUG=327272
> TEST=none
> R=estade@chromium.org
>
> Review URL: https://codereview.chromium.org/207183002
TBR=isherman@chromium.org
Review URL: https://codereview.chromium.org/208213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/autofill/content')
| -rw-r--r-- | components/autofill/content/browser/risk/fingerprint.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/components/autofill/content/browser/risk/fingerprint.cc b/components/autofill/content/browser/risk/fingerprint.cc index 1f412c5..62b0b24 100644 --- a/components/autofill/content/browser/risk/fingerprint.cc +++ b/components/autofill/content/browser/risk/fingerprint.cc @@ -360,8 +360,7 @@ FingerprintDataLoader::FingerprintDataLoader( weak_ptr_factory_.GetWeakPtr())); // Load GPU data if needed. - if (gpu_data_manager_->GpuAccessAllowed(NULL) && - !gpu_data_manager_->IsCompleteGpuInfoAvailable()) { + if (!gpu_data_manager_->IsCompleteGpuInfoAvailable()) { gpu_observer_.Add(gpu_data_manager_); gpu_data_manager_->RequestCompleteGpuInfoIfNeeded(); } @@ -426,8 +425,7 @@ void FingerprintDataLoader::MaybeFillFingerprint() { // If all of the data has been loaded, or if the |timeout_timer_| has expired, // fill the fingerprint and clean up. if (!timeout_timer_.IsRunning() || - ((!gpu_data_manager_->GpuAccessAllowed(NULL) || - gpu_data_manager_->IsCompleteGpuInfoAvailable()) && + (gpu_data_manager_->IsCompleteGpuInfoAvailable() && fonts_ && !waiting_on_plugins_ && (geoposition_.Validate() || |