Compute GpuDriverBugWorkarounds only one time in the GPU process

gpu/command_buffer/service/feature_info.h

Index: gpu/command_buffer/service/feature_info.h
diff --git a/gpu/command_buffer/service/feature_info.h b/gpu/command_buffer/service/feature_info.h
index e343dd9f59388654e2bc39a181ca558082f1aa7e..d8a1c82fe95714b3a784cb727c6efe9b260a1cd9 100644
--- a/gpu/command_buffer/service/feature_info.h
+++ b/gpu/command_buffer/service/feature_info.h
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/gles2_cmd_validation.h"
-#include "gpu/config/gpu_driver_bug_workaround_type.h"
+#include "gpu/config/gpu_driver_bug_workarounds.h"
 #include "gpu/gpu_export.h"
 
 namespace base {
@@ -90,27 +90,12 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
     bool ext_read_format_bgra;
   };
 
-  struct Workarounds {
-    Workarounds();
-
-#define GPU_OP(type, name) bool name;
-    GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)
-#undef GPU_OP
-
-    // Note: 0 here means use driver limit.
-    GLint max_texture_size;
-    GLint max_cube_map_texture_size;
-    GLint max_fragment_uniform_vectors;
-    GLint max_varying_vectors;
-    GLint max_vertex_uniform_vectors;
-    GLint max_copy_texture_chromium_size;
-  };
-
   // Constructor with workarounds taken from the current process's CommandLine
-  FeatureInfo();
+  FeatureInfo(const GpuDriverBugWorkarounds& gpu_driver_bug_workarounds);

[piman, 2016/04/12 04:38:44]

nit: explicit

[Julien Isorce Samsung, 2016/04/12 16:11:32]

Done.

 
   // Constructor with workarounds taken from |command_line|
-  FeatureInfo(const base::CommandLine& command_line);
+  FeatureInfo(const base::CommandLine& command_line,
+              const GpuDriverBugWorkarounds& gpu_driver_bug_workarounds);
 
   // Initializes the feature information. Needs a current GL context.
   bool Initialize(ContextType context_type,
@@ -135,9 +120,7 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
     return feature_flags_;
   }
 
-  const Workarounds& workarounds() const {
-    return workarounds_;
-  }
+  const GpuDriverBugWorkarounds& workarounds() const { return workarounds_; }
 
   const DisallowedFeatures& disallowed_features() const {
     return disallowed_features_;
@@ -188,7 +171,7 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
   FeatureFlags feature_flags_;
 
   // Flags for Workarounds.
-  Workarounds workarounds_;
+  const GpuDriverBugWorkarounds& workarounds_;
 
   // Whether the command line switch kEnableUnsafeES3APIs is passed in.
   bool enable_unsafe_es3_apis_switch_;