Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / gpu / config / gpu_util.cc

diff --git a/src/gpu/config/gpu_util.cc b/src/gpu/config/gpu_util.cc
index 9c868e1..4605981 100644 (file)
--- a/src/gpu/config/gpu_util.cc
+++ b/src/gpu/config/gpu_util.cc
@@ -65,11 +65,10 @@ void ApplyGpuDriverBugWorkarounds(
   scoped_ptr<GpuDriverBugList> list(GpuDriverBugList::Create());
   list->LoadList(kGpuDriverBugListJson,
                  GpuControlList::kCurrentOsOnly);
-  std::set<int> workarounds = WorkaroundsFromCommandLine(command_line);
-  if (workarounds.empty()) {
-    workarounds = list->MakeDecision(
-        GpuControlList::kOsAny, std::string(), gpu_info);
-  }
+  std::set<int> workarounds = list->MakeDecision(
+      GpuControlList::kOsAny, std::string(), gpu_info);
+  GpuDriverBugList::AppendWorkaroundsFromCommandLine(
+      &workarounds, *command_line);
   if (!workarounds.empty()) {
     command_line->AppendSwitchASCII(switches::kGpuDriverBugWorkarounds,
                                     IntSetToString(workarounds));
@@ -81,16 +80,4 @@ void StringToFeatureSet(
   StringToIntSet(str, feature_set);
 }
 
-std::set<int> WorkaroundsFromCommandLine(CommandLine* command_line) {
-  std::set<int> workarounds;
-  const struct DriverBugInfo* kFeatureList = GetDriverBugWorkarounds();
-
-  for (int i = 0; i < NUMBER_OF_GPU_DRIVER_BUG_WORKAROUND_TYPES; i++) {
-    if (command_line->HasSwitch(kFeatureList[i].feature_name))
-      workarounds.insert(kFeatureList[i].feature_type);
-  }
-
-  return workarounds;
-}
-
 }  // namespace gpu