summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgeofflang@chromium.org <geofflang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 20:23:04 +0000
committergeofflang@chromium.org <geofflang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 20:23:04 +0000
commitc3387c54641aa68b0c36893767e439283703b6dc (patch)
treed0dcdbd45b5b779c7a66d0e3fb7a165f4c5d4b15
parent1578e372c922ffe7c297d48f3cb638909ca16e45 (diff)
downloadchromium_src-c3387c54641aa68b0c36893767e439283703b6dc.zip
chromium_src-c3387c54641aa68b0c36893767e439283703b6dc.tar.gz
chromium_src-c3387c54641aa68b0c36893767e439283703b6dc.tar.bz2
Remove the enable-d3d11 flag so that d3d11 is enabled by default.
BUG=258676 R=kbr@chromium.org Review URL: https://codereview.chromium.org/177003009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260937 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/browser/about_flags.cc7
-rw-r--r--content/test/gpu/page_sets/pixel_tests.json2
-rw-r--r--ui/gl/gl_surface_win.cc3
-rw-r--r--ui/gl/gl_switches.cc4
-rw-r--r--ui/gl/gl_switches.h1
6 files changed, 2 insertions, 21 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index fe06feb..b900e8a 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6157,12 +6157,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_ENABLE_WEBGL_DESCRIPTION" desc="Description for the flag to enable WebGL.">
Enabling this option allows web applications to access the WebGL API.
</message>
- <message name="IDS_FLAGS_ENABLE_D3D11_NAME" desc="Name of the 'Enable D3D11' lab.">
- Enable D3D11
- </message>
- <message name="IDS_FLAGS_ENABLE_D3D11_DESCRIPTION" desc="Description for the flag to enable D3D11.">
- Enabling this option allows the use of Direct3D 11 on configurations that support it.
- </message>
<message name="IDS_FLAGS_ENABLE_WEBGL_DRAFT_EXTENSIONS_NAME" desc="Name of the 'Enable WebGL Draft Extensions' flag.">
Enable WebGL Draft Extensions
</message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 752c76f..67eacca 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -530,13 +530,6 @@ const Experiment kExperiments[] = {
SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)
},
{
- "enable-d3d11",
- IDS_FLAGS_ENABLE_D3D11_NAME,
- IDS_FLAGS_ENABLE_D3D11_DESCRIPTION,
- kOsWin,
- SINGLE_VALUE_TYPE(switches::kEnableD3D11)
- },
- {
"disable-webrtc",
IDS_FLAGS_DISABLE_WEBRTC_NAME,
IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION,
diff --git a/content/test/gpu/page_sets/pixel_tests.json b/content/test/gpu/page_sets/pixel_tests.json
index 0776fd7..649241c 100644
--- a/content/test/gpu/page_sets/pixel_tests.json
+++ b/content/test/gpu/page_sets/pixel_tests.json
@@ -41,7 +41,7 @@
"timeout": 30
}
],
- "revision": 4,
+ "revision": 3,
"test_rect": [0, 0, 400, 300]
}
]
diff --git a/ui/gl/gl_surface_win.cc b/ui/gl/gl_surface_win.cc
index eb99421e..c0a223b 100644
--- a/ui/gl/gl_surface_win.cc
+++ b/ui/gl/gl_surface_win.cc
@@ -295,8 +295,7 @@ scoped_refptr<GLSurface> GLSurface::CreateOffscreenGLSurface(
}
EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableD3D11) &&
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableD3D11))
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableD3D11))
return EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE;
return EGL_DEFAULT_DISPLAY;
diff --git a/ui/gl/gl_switches.cc b/ui/gl/gl_switches.cc
index fb9d3d8..d32786f 100644
--- a/ui/gl/gl_switches.cc
+++ b/ui/gl/gl_switches.cc
@@ -18,9 +18,6 @@ const char kGLImplementationMockName[] = "mock";
namespace switches {
-// Enables use of D3D11 when available.
-const char kEnableD3D11[] = "enable-d3d11";
-
// Disables use of D3D11.
const char kDisableD3D11[] = "disable-d3d11";
@@ -75,7 +72,6 @@ const char kUseGpuInTests[] = "use-gpu-in-tests";
// to read it in the GPU process, else don't add it.
const char* kGLSwitchesCopiedFromGpuProcessHost[] = {
kDisableGpuVsync,
- kEnableD3D11,
kDisableD3D11,
kEnableGPUServiceLogging,
kEnableGPUServiceTracing,
diff --git a/ui/gl/gl_switches.h b/ui/gl/gl_switches.h
index 9f6038f..e64b3da 100644
--- a/ui/gl/gl_switches.h
+++ b/ui/gl/gl_switches.h
@@ -23,7 +23,6 @@ extern const char kGLImplementationMockName[];
namespace switches {
-GL_EXPORT extern const char kEnableD3D11[];
GL_EXPORT extern const char kDisableD3D11[];
GL_EXPORT extern const char kDisableGpuVsync[];
GL_EXPORT extern const char kEnableGPUServiceLogging[];