| Index: gpu/command_buffer/service/feature_info.cc
|
| diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc
|
| index 9329bc590fb67512cd2b6513553bb17f450efb5a..d8d28e89ccd612129ceee7021fae14a602182cfd 100644
|
| --- a/gpu/command_buffer/service/feature_info.cc
|
| +++ b/gpu/command_buffer/service/feature_info.cc
|
| @@ -8,10 +8,10 @@
|
|
|
| #include "base/command_line.h"
|
| #include "base/strings/string_number_conversions.h"
|
| -#include "base/strings/string_split.h"
|
| #include "base/strings/string_util.h"
|
| #include "gpu/command_buffer/service/gl_utils.h"
|
| #include "gpu/command_buffer/service/gpu_switches.h"
|
| +#include "gpu/config/gpu_util.h"
|
| #include "ui/gl/gl_implementation.h"
|
|
|
| #if defined(OS_MACOSX)
|
| @@ -69,13 +69,11 @@ class StringSet {
|
| void StringToWorkarounds(
|
| const std::string& types, FeatureInfo::Workarounds* workarounds) {
|
| DCHECK(workarounds);
|
| - std::vector<std::string> pieces;
|
| - base::SplitString(types, ',', &pieces);
|
| - for (size_t i = 0; i < pieces.size(); ++i) {
|
| - int number = 0;
|
| - bool succeed = base::StringToInt(pieces[i], &number);
|
| - DCHECK(succeed);
|
| - switch (number) {
|
| + std::set<int> int_set;
|
| + gpu::StringToFeatureSet(types, &int_set);
|
| + for (std::set<int>::const_iterator it = int_set.begin();
|
| + it != int_set.end(); ++it) {
|
| + switch (*it) {
|
| #define GPU_OP(type, name) \
|
| case gpu::type: \
|
| workarounds->name = true; \
|
|
|