summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gpu_data_manager.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/gpu_data_manager.cc')
-rw-r--r--chrome/browser/gpu_data_manager.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/gpu_data_manager.cc b/chrome/browser/gpu_data_manager.cc
index d62434a..1ef345b 100644
--- a/chrome/browser/gpu_data_manager.cc
+++ b/chrome/browser/gpu_data_manager.cc
@@ -74,10 +74,9 @@ void GpuDataManager::RequestCompleteGpuInfoIfNeeded() {
void GpuDataManager::UpdateGpuInfo(const GPUInfo& gpu_info) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (gpu_info_.finalized)
+ if (!gpu_info_.Merge(gpu_info))
return;
- gpu_info_ = gpu_info;
- child_process_logging::SetGpuInfo(gpu_info);
+ child_process_logging::SetGpuInfo(gpu_info_);
// Clear the flag to triger a re-computation of GpuFeatureFlags using the
// updated GPU info.
gpu_feature_flags_set_ = false;