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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ui/gl/gl_surface_egl.cc

Issue 189543017: Revert 254571 "Remove the enable-d3d11 flag so that d3d11 is ena..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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 | « trunk/src/content/test/gpu/page_sets/pixel_tests.json ('k') | trunk/src/ui/gl/gl_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/gl/gl_surface_egl.cc
===================================================================
--- trunk/src/ui/gl/gl_surface_egl.cc (revision 256016)
+++ trunk/src/ui/gl/gl_surface_egl.cc (working copy)
@@ -131,7 +131,8 @@
g_native_display = base::MessagePumpForUI::GetDefaultXDisplay();
#elif defined(OS_WIN)
g_native_display = EGL_DEFAULT_DISPLAY;
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableD3D11)) {
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableD3D11) &&
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableD3D11)) {
g_native_display = EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE;
}
#elif defined(USE_OZONE)
« no previous file with comments | « trunk/src/content/test/gpu/page_sets/pixel_tests.json ('k') | trunk/src/ui/gl/gl_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698