Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1912)

Unified Diff: content/public/browser/gpu_utils.cc

Issue 2460943002: Lower ES3 capable requirement to GL 3.3 with extensions. (Closed)
Patch Set: address piman comment Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/resources/gpu/info_view.js ('k') | content/test/gpu/page_sets/gpu_process_tests.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/gpu_utils.cc
diff --git a/content/public/browser/gpu_utils.cc b/content/public/browser/gpu_utils.cc
index d537c35eb20cd0d58bdb8ce44884d2a8f706b9b9..2ebdc851f53c134234bee26f6d038835116201e1 100644
--- a/content/public/browser/gpu_utils.cc
+++ b/content/public/browser/gpu_utils.cc
@@ -104,7 +104,8 @@ const gpu::GpuPreferences GetGpuPreferencesFromCommandLine() {
gpu_preferences.enable_gpu_service_tracing =
command_line->HasSwitch(switches::kEnableGPUServiceTracing);
gpu_preferences.enable_unsafe_es3_apis =
- command_line->HasSwitch(switches::kEnableUnsafeES3APIs);
+ command_line->HasSwitch(switches::kEnableUnsafeES3APIs) &&
+ !command_line->HasSwitch(switches::kDisableES3APIs);
gpu_preferences.use_passthrough_cmd_decoder =
command_line->HasSwitch(switches::kUsePassthroughCmdDecoder);
return gpu_preferences;
« no previous file with comments | « content/browser/resources/gpu/info_view.js ('k') | content/test/gpu/page_sets/gpu_process_tests.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698