diff options
| author | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 23:18:17 +0000 |
|---|---|---|
| committer | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 23:18:17 +0000 |
| commit | 339055e09fff658531327678f80f6e5624427aee (patch) | |
| tree | 81f943520eeb8a6f332dac79907e73ed7fddefe8 | |
| parent | 78a3fb08359de3a027bc8f03aeadc58c40d42e4f (diff) | |
| download | chromium_src-339055e09fff658531327678f80f6e5624427aee.zip chromium_src-339055e09fff658531327678f80f6e5624427aee.tar.gz chromium_src-339055e09fff658531327678f80f6e5624427aee.tar.bz2 | |
If a field in GPUInfo is not collected, we should not clear it because it might contain values from a previous info collection. The logic was lost in a recent GPUInfo code refactoring from r77300.
BUG=none
TEST=none
TBR=jam
Review URL: http://codereview.chromium.org/6659012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77544 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/gpu/gpu_info_collector_linux.cc | 1 | ||||
| -rw-r--r-- | chrome/gpu/gpu_info_collector_mac.mm | 2 | ||||
| -rw-r--r-- | chrome/gpu/gpu_info_collector_win.cc | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/chrome/gpu/gpu_info_collector_linux.cc b/chrome/gpu/gpu_info_collector_linux.cc index 9763e72..e77d6ff 100644 --- a/chrome/gpu/gpu_info_collector_linux.cc +++ b/chrome/gpu/gpu_info_collector_linux.cc @@ -273,7 +273,6 @@ bool CollectDriverInfoGL(GPUInfo* gpu_info) { gpu_info->driver_vendor = pieces[1]; gpu_info->driver_version = driver_version; - gpu_info->driver_date = ""; return true; } diff --git a/chrome/gpu/gpu_info_collector_mac.mm b/chrome/gpu/gpu_info_collector_mac.mm index d376560..68327fe 100644 --- a/chrome/gpu/gpu_info_collector_mac.mm +++ b/chrome/gpu/gpu_info_collector_mac.mm @@ -96,9 +96,7 @@ bool CollectDriverInfoGL(GPUInfo* gpu_info) { size_t pos = gl_version_string.find_last_of('-'); if (pos == std::string::npos) return false; - gpu_info->driver_vendor = ""; gpu_info->driver_version = gl_version_string.substr(pos + 1); - gpu_info->driver_date = ""; return true; } diff --git a/chrome/gpu/gpu_info_collector_win.cc b/chrome/gpu/gpu_info_collector_win.cc index fc09eab..2617fb0 100644 --- a/chrome/gpu/gpu_info_collector_win.cc +++ b/chrome/gpu/gpu_info_collector_win.cc @@ -232,7 +232,6 @@ bool CollectDriverInfoD3D(const std::wstring& device_id, GPUInfo* gpu_info) { if (result == ERROR_SUCCESS) driver_date = WideToASCII(std::wstring(value)); - gpu_info->driver_vendor = ""; gpu_info->driver_version = driver_version; gpu_info->driver_date = driver_date; found = true; @@ -256,9 +255,7 @@ bool CollectDriverInfoGL(GPUInfo* gpu_info) { size_t pos = gl_version_string.find_last_not_of("0123456789."); if (pos != std::string::npos && pos < gl_version_string.length() - 1) { - gpu_info->driver_vendor = ""; gpu_info->driver_version = gl_version_string.substr(pos + 1); - gpu_info->driver_date = ""; return true; } return false; |