| Index: ui/gl/gl_surface_win.cc
|
| diff --git a/ui/gl/gl_surface_win.cc b/ui/gl/gl_surface_win.cc
|
| index c0a223b76082056c42a2175ce8254ac90d1a0e35..eb99421ee3a60ce22cebffd41dd18c98e696e91b 100644
|
| --- a/ui/gl/gl_surface_win.cc
|
| +++ b/ui/gl/gl_surface_win.cc
|
| @@ -295,7 +295,8 @@ scoped_refptr<GLSurface> GLSurface::CreateOffscreenGLSurface(
|
| }
|
|
|
| EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
|
| - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableD3D11))
|
| + if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableD3D11) &&
|
| + CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableD3D11))
|
| return EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE;
|
|
|
| return EGL_DEFAULT_DISPLAY;
|
|
|