Chromium Code Reviews| Index: ui/gl/gl_context_egl.cc |
| diff --git a/ui/gl/gl_context_egl.cc b/ui/gl/gl_context_egl.cc |
| index 6af5611d08ffee62bc4e5fe8e1bd08567e12b877..64ba1431d8f142120526d1b9fd0f063b613a370b 100644 |
| --- a/ui/gl/gl_context_egl.cc |
| +++ b/ui/gl/gl_context_egl.cc |
| @@ -52,9 +52,9 @@ bool GLContextEGL::Initialize( |
| } |
| EGLint context_client_version = 2; |
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| - switches::kEnableUnsafeES3APIs) && |
| - (config_renderable_type & EGL_OPENGL_ES3_BIT) != 0) { |
| + if ((config_renderable_type & EGL_OPENGL_ES3_BIT) != 0 && |
| + !base::CommandLine::ForCurrentProcess()->HasSwitch( |
| + switches::kDisableES3ANGLE)) { |
|
Ken Russell (switch to Gerrit)
2016/09/21 21:18:32
Thinking about this more, perhaps the switch and d
Zhenyao Mo
2016/09/21 21:39:06
I suggest use "disable_es3_gl_context" instead, be
|
| context_client_version = 3; |
| } |
| @@ -86,7 +86,6 @@ bool GLContextEGL::Initialize( |
| return false; |
| } |
| - |
| context_ = eglCreateContext( |
| display_, |
| config_, |