diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 23:56:55 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 23:56:55 +0000 |
| commit | a80f5ece3d46eeb0734cfca6c716d69e7ab7aaa2 (patch) | |
| tree | e1b989fd7c67f745061a481692671b1331cffe02 /content/browser/gpu/gpu_data_manager.h | |
| parent | 56cbcc3ce45c1b68f9fbdbed6244bebe1f203403 (diff) | |
| download | chromium_src-a80f5ece3d46eeb0734cfca6c716d69e7ab7aaa2.zip chromium_src-a80f5ece3d46eeb0734cfca6c716d69e7ab7aaa2.tar.gz chromium_src-a80f5ece3d46eeb0734cfca6c716d69e7ab7aaa2.tar.bz2 | |
Move GPUInfo to content/public/common and put it into the content namespace.
BUG=98716
Review URL: http://codereview.chromium.org/8363007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_data_manager.h')
| -rw-r--r-- | content/browser/gpu/gpu_data_manager.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/content/browser/gpu/gpu_data_manager.h b/content/browser/gpu/gpu_data_manager.h index bac847d..e92f716 100644 --- a/content/browser/gpu/gpu_data_manager.h +++ b/content/browser/gpu/gpu_data_manager.h @@ -17,7 +17,7 @@ #include "base/values.h" #include "content/common/content_export.h" #include "content/common/gpu/gpu_feature_flags.h" -#include "content/common/gpu/gpu_info.h" +#include "content/public/common/gpu_info.h" class CommandLine; class GpuBlacklist; @@ -31,9 +31,9 @@ class CONTENT_EXPORT GpuDataManager { void RequestCompleteGpuInfoIfNeeded(); // Only update if the current GPUInfo is not finalized. - void UpdateGpuInfo(const GPUInfo& gpu_info); + void UpdateGpuInfo(const content::GPUInfo& gpu_info); - const GPUInfo& gpu_info() const; + const content::GPUInfo& gpu_info() const; // Returns status of various GPU features. This is two parted: // { @@ -178,6 +178,15 @@ class CONTENT_EXPORT GpuDataManager { // If use-gl switch is osmesa or any, return true. bool UseGLIsOSMesaOrAny(); + // Merges the second GPUInfo object with the first. + // If it's the same GPU, i.e., device id and vendor id are the same, then + // copy over the fields that are not set yet and ignore the rest. + // If it's a different GPU, then reset and copy over everything. + // Return true if something changes that may affect blacklisting; currently + // they are device_id, vendor_id, driver_vendor, driver_version, driver_date, + // and gl_renderer. + static bool Merge(content::GPUInfo* object, const content::GPUInfo& other); + bool complete_gpu_info_already_requested_; GpuFeatureFlags gpu_feature_flags_; @@ -185,7 +194,7 @@ class CONTENT_EXPORT GpuDataManager { UserFlags user_flags_; - GPUInfo gpu_info_; + content::GPUInfo gpu_info_; mutable base::Lock gpu_info_lock_; scoped_ptr<GpuBlacklist> gpu_blacklist_; |