diff options
| author | vangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 22:54:12 +0000 |
|---|---|---|
| committer | vangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 22:54:12 +0000 |
| commit | fd67a518fecd9c0af5ac30bde378d8c784e60071 (patch) | |
| tree | 8ce8dac0168d687b02c86c8b1a150a982ceae798 | |
| parent | c9b32721aeaa1e4933cfc5bb926a398c36a34c6b (diff) | |
| download | chromium_src-fd67a518fecd9c0af5ac30bde378d8c784e60071.zip chromium_src-fd67a518fecd9c0af5ac30bde378d8c784e60071.tar.gz chromium_src-fd67a518fecd9c0af5ac30bde378d8c784e60071.tar.bz2 | |
Merge 85031 - Only block the GPU process if WebGL, compositing or Canvas2D are blacklisted
(but not if multisampling is blacklisted). This allows us to run on Mac's with AMD GPUs.
(manual merge as the file moved around)
BUG=82104
TBR=vangelis@chromium.org
Review URL: http://codereview.chromium.org/7011008
git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85066 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/gpu_data_manager.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/gpu_data_manager.cc b/chrome/browser/gpu_data_manager.cc index 7ef8acd..8fe42f0 100644 --- a/chrome/browser/gpu_data_manager.cc +++ b/chrome/browser/gpu_data_manager.cc @@ -97,7 +97,15 @@ GpuFeatureFlags GpuDataManager::GetGpuFeatureFlags() { } bool GpuDataManager::GpuAccessAllowed() { - return gpu_feature_flags_.flags() == 0; + uint32 flags = gpu_feature_flags_.flags(); + + // This will in effect block access to all GPU features if any of them + // is blacklisted. + // TODO(vangelis): Restructure the code to make it possible to selectively + // blaclist gpu features. + return !(flags & GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas || + flags & GpuFeatureFlags::kGpuFeatureAcceleratedCompositing || + flags & GpuFeatureFlags::kGpuFeatureWebgl); } void GpuDataManager::AddGpuInfoUpdateCallback(Callback0::Type* callback) { |