| 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 d30abaa72f216f6d547b875e8f998619eaad3d3a..d2407028b68945c99e4b2babc96f9eac5d15fc16 100644
|
| --- a/gpu/command_buffer/service/feature_info.cc
|
| +++ b/gpu/command_buffer/service/feature_info.cc
|
| @@ -200,7 +200,8 @@ void FeatureInfo::InitializeBasicState(const base::CommandLine* command_line) {
|
| (command_line->GetSwitchValueASCII(switches::kUseGL) == "swiftshader");
|
|
|
| enable_unsafe_es3_apis_switch_ =
|
| - command_line->HasSwitch(switches::kEnableUnsafeES3APIs);
|
| + command_line->HasSwitch(switches::kEnableUnsafeES3APIs) &&
|
| + !command_line->HasSwitch(switches::kDisableES3APIs);
|
|
|
| // The shader translator is needed to translate from WebGL-conformant GLES SL
|
| // to normal GLES SL, enforce WebGL conformance, translate from GLES SL 1.0 to
|
|
|