Fix disabled extensions for virtual contexts and respect command line.

content/browser/gpu/gpu_data_manager_impl_private.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 555 matching lines @@
         gpu::GpuControlList::kOsAny, std::string(), gpu_info_);
     if (update_histograms_)
       UpdateStats(gpu_info_, gpu_blacklist_.get(), features);
 
     UpdateBlacklistedFeatures(features);
   }
   if (gpu_driver_bug_list_) {
     gpu_driver_bugs_ = gpu_driver_bug_list_->MakeDecision(
         gpu::GpuControlList::kOsAny, std::string(), gpu_info_);
 
+    std::set<std::string> disabled_ext_set;
+
+    // Merge disabled extensions from the command line with gpu driver bug list.
+    const base::CommandLine* command_line =
+        base::CommandLine::ForCurrentProcess();
+    if (command_line) {
+      const std::vector<std::string>& disabled_command_line_exts =
+          base::SplitString(
+              command_line->GetSwitchValueASCII(switches::kDisableGLExtensions),
+              ", ;", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
+      disabled_ext_set.insert(disabled_command_line_exts.begin(),
+                              disabled_command_line_exts.end());
+    }
+    const std::vector<std::string>& disabled_driver_bug_exts =
+        gpu_driver_bug_list_->GetDisabledExtensions();
+    disabled_ext_set.insert(disabled_driver_bug_exts.begin(),
+                            disabled_driver_bug_exts.end());
     disabled_extensions_ =
-        base::JoinString(gpu_driver_bug_list_->GetDisabledExtensions(), " ");
+        base::JoinString(std::vector<std::string>(disabled_ext_set.begin(),
+                                                  disabled_ext_set.end()),
+                         " ");
   }
   gpu::GpuDriverBugList::AppendWorkaroundsFromCommandLine(
       &gpu_driver_bugs_, *base::CommandLine::ForCurrentProcess());
 
   // We have to update GpuFeatureType before notify all the observers.
   NotifyGpuInfoUpdate();
 }
 
 void GpuDataManagerImplPrivate::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) {
   // No further update of gpu_info if falling back to SwiftShader.
@@ skipping 323 matching lines @@
   if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE))
     return true;
   if (group_name == "Disabled")
     return true;
   return false;
 }
 
 void GpuDataManagerImplPrivate::GetDisabledExtensions(
     std::string* disabled_extensions) const {
   DCHECK(disabled_extensions);
-
   *disabled_extensions = disabled_extensions_;
 }
 
 void GpuDataManagerImplPrivate::BlockDomainFrom3DAPIs(
     const GURL& url, GpuDataManagerImpl::DomainGuilt guilt) {
   BlockDomainFrom3DAPIsAtTime(url, guilt, base::Time::Now());
 }
 
 bool GpuDataManagerImplPrivate::Are3DAPIsBlocked(const GURL& top_origin_url,
                                                  int render_process_id,
@@ skipping 274 matching lines @@
   gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
 #if defined(OS_WIN)
   gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
 #endif
   complete_gpu_info_already_requested_ = true;
   // Some observers might be waiting.
   NotifyGpuInfoUpdate();
 }
 
 }  // namespace content