FeatureInfo: Remove allowed_extensions and init workarounds early

gpu/command_buffer/service/feature_info.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/feature_info.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 115 matching lines @@
 
 FeatureInfo::Workarounds::Workarounds() :
 #define GPU_OP(type, name) name(false),
     GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)
 #undef GPU_OP
     max_texture_size(0),
     max_cube_map_texture_size(0) {
 }
 
 FeatureInfo::FeatureInfo() {
+  InitializeBasicState(*CommandLine::ForCurrentProcess());
+}
+
+FeatureInfo::FeatureInfo(const CommandLine& command_line) {
+  InitializeBasicState(command_line);
+}
+
+void FeatureInfo::InitializeBasicState(const CommandLine& command_line) {
+  if (command_line.HasSwitch(switches::kGpuDriverBugWorkarounds)) {
+    std::string types = command_line.GetSwitchValueASCII(
+        switches::kGpuDriverBugWorkarounds);
+    StringToWorkarounds(types, &workarounds_);
+  }
+  feature_flags_.enable_shader_name_hashing =
+      !command_line.HasSwitch(switches::kDisableShaderNameHashing);
+
   static const GLenum kAlphaTypes[] = {
       GL_UNSIGNED_BYTE,
   };
   static const GLenum kRGBTypes[] = {
       GL_UNSIGNED_BYTE,
       GL_UNSIGNED_SHORT_5_6_5,
   };
   static const GLenum kRGBATypes[] = {
       GL_UNSIGNED_BYTE,
       GL_UNSIGNED_SHORT_4_4_4_4,
@@ skipping 15 matching lines @@
   };
   for (size_t ii = 0; ii < arraysize(kFormatTypes); ++ii) {
     const FormatInfo& info = kFormatTypes[ii];
     ValueValidator<GLenum>& validator = texture_format_validators_[info.format];
     for (size_t jj = 0; jj < info.count; ++jj) {
       validator.AddValue(info.types[jj]);
     }
   }
 }
 
-bool FeatureInfo::Initialize(const char* allowed_features) {
+bool FeatureInfo::Initialize() {
   disallowed_features_ = DisallowedFeatures();
-  AddFeatures(*CommandLine::ForCurrentProcess());
+  InitializeFeatures();
   return true;
 }
 
-bool FeatureInfo::Initialize(const DisallowedFeatures& disallowed_features,
-                             const char* allowed_features) {
+bool FeatureInfo::Initialize(const DisallowedFeatures& disallowed_features) {
   disallowed_features_ = disallowed_features;
-  AddFeatures(*CommandLine::ForCurrentProcess());
+  InitializeFeatures();
   return true;
 }
 
-void FeatureInfo::AddFeatures(const CommandLine& command_line) {
+void FeatureInfo::InitializeFeatures() {
   // Figure out what extensions to turn on.
   StringSet extensions(
       reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS)));
 
-  if (command_line.HasSwitch(switches::kGpuDriverBugWorkarounds)) {
-    std::string types = command_line.GetSwitchValueASCII(
-        switches::kGpuDriverBugWorkarounds);
-    StringToWorkarounds(types, &workarounds_);
-  }
-
-  feature_flags_.enable_shader_name_hashing =
-      !command_line.HasSwitch(switches::kDisableShaderNameHashing);
-
   bool npot_ok = false;
 
   AddExtensionString("GL_ANGLE_translated_shader_source");
   AddExtensionString("GL_CHROMIUM_async_pixel_transfers");
   AddExtensionString("GL_CHROMIUM_bind_uniform_location");
   AddExtensionString("GL_CHROMIUM_command_buffer_query");
   AddExtensionString("GL_CHROMIUM_command_buffer_latency_query");
   AddExtensionString("GL_CHROMIUM_copy_texture");
   AddExtensionString("GL_CHROMIUM_discard_backbuffer");
   AddExtensionString("GL_CHROMIUM_get_error_query");
@@ skipping 476 matching lines @@
   if (extensions_.find(str) == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu