diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 17:39:46 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 17:39:46 +0000 |
| commit | a8e0a2d93957cd19766e2de65f9830cc2df2e735 (patch) | |
| tree | a3be41fb05604c5c49de053528ca4abb464635df /content/browser/gpu | |
| parent | 45029313b2f5c6e7ca38efe08bbb66b36d8bea5f (diff) | |
| download | chromium_src-a8e0a2d93957cd19766e2de65f9830cc2df2e735.zip chromium_src-a8e0a2d93957cd19766e2de65f9830cc2df2e735.tar.gz chromium_src-a8e0a2d93957cd19766e2de65f9830cc2df2e735.tar.bz2 | |
Revert 93236 (broke GPU support on CrOs and Linux 32-bit, see http://crbug.com/90201) - Disallow gpu access if preliminary gpu info collection fails.
It's likely something seriously wrong with the graphics driver if preliminary gpu info collection fails.
BUG=89358
TEST=bots green
Review URL: http://codereview.chromium.org/7472002
TBR=zmo@google.com
Review URL: http://codereview.chromium.org/7495005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu')
| -rw-r--r-- | content/browser/gpu/gpu_data_manager.cc | 5 | ||||
| -rw-r--r-- | content/browser/gpu/gpu_data_manager.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/content/browser/gpu/gpu_data_manager.cc b/content/browser/gpu/gpu_data_manager.cc index e790794..dc70ade 100644 --- a/content/browser/gpu/gpu_data_manager.cc +++ b/content/browser/gpu/gpu_data_manager.cc @@ -47,8 +47,7 @@ GpuDataManager::GpuDataManager() DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); GPUInfo gpu_info; - allows_gpu_access_ = - gpu_info_collector::CollectPreliminaryGraphicsInfo(&gpu_info); + gpu_info_collector::CollectPreliminaryGraphicsInfo(&gpu_info); UpdateGpuInfo(gpu_info); #if defined(OS_MACOSX) @@ -143,8 +142,6 @@ GpuFeatureFlags GpuDataManager::GetGpuFeatureFlags() { } bool GpuDataManager::GpuAccessAllowed() { - if (!allows_gpu_access_) - return false; // We only need to block GPU process if more features are disallowed other // than those in the preliminary gpu feature flags because the latter work // through renderer commandline switches. diff --git a/content/browser/gpu/gpu_data_manager.h b/content/browser/gpu/gpu_data_manager.h index 0243da5..bc373ed 100644 --- a/content/browser/gpu/gpu_data_manager.h +++ b/content/browser/gpu/gpu_data_manager.h @@ -99,9 +99,9 @@ class GpuDataManager { bool complete_gpu_info_already_requested_; + bool gpu_feature_flags_set_; GpuFeatureFlags gpu_feature_flags_; GpuFeatureFlags preliminary_gpu_feature_flags_; - bool allows_gpu_access_; GPUInfo gpu_info_; mutable base::Lock gpu_info_lock_; |