Upstream version 7.36.149.0

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

diff --git a/src/gpu/config/gpu_util.h b/src/gpu/config/gpu_util.h
index 6d6800e..21c802c 100644 (file)
--- a/src/gpu/config/gpu_util.h
+++ b/src/gpu/config/gpu_util.h
@@ -8,21 +8,17 @@
 #include <set>
 #include <string>
 
+#include "base/command_line.h"
 #include "build/build_config.h"
-#include "gpu/config/gpu_switching_option.h"
 #include "gpu/gpu_export.h"
 
+namespace base {
 class CommandLine;
+}
 
 namespace gpu {
 
-// Maps string to GpuSwitchingOption; returns GPU_SWITCHING_UNKNOWN if an
-// unknown name is input (case-sensitive).
-GPU_EXPORT GpuSwitchingOption StringToGpuSwitchingOption(
-    const std::string& switching_string);
-
-// Gets a string version of a GpuSwitchingOption.
-GPU_EXPORT std::string GpuSwitchingOptionToString(GpuSwitchingOption option);
+struct GPUInfo;
 
 // Merge features in src into dst.
 GPU_EXPORT void MergeFeatureSets(
@@ -30,7 +26,16 @@ GPU_EXPORT void MergeFeatureSets(
 
 // Collect basic GPUInfo, compute the driver bug workarounds for the current
 // system, and append the |command_line|.
-GPU_EXPORT void ApplyGpuDriverBugWorkarounds(CommandLine* command_line);
+GPU_EXPORT void ApplyGpuDriverBugWorkarounds(base::CommandLine* command_line);
+
+// With provided GPUInfo, compute the driver bug workarounds for the current
+// system, and append the |command_line|.
+GPU_EXPORT void ApplyGpuDriverBugWorkarounds(
+    const GPUInfo& gpu_inco, base::CommandLine* command_line);
+
+// |str| is in the format of "feature1,feature2,...,featureN".
+GPU_EXPORT void StringToFeatureSet(
+    const std::string& str, std::set<int>* feature_set);
 
 }  // namespace gpu