summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/generated_resources.grd8
-rw-r--r--chrome/browser/about_flags.cc8
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc2
-rw-r--r--content/common/sandbox_win.cc2
-rw-r--r--content/public/common/content_switches.cc6
-rw-r--r--content/public/common/content_switches.h2
6 files changed, 14 insertions, 14 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2168a38..0b97e72 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5640,11 +5640,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
Prevents the automatic combining of composited layers.
</message>
<if expr="is_win">
- <message name="IDS_FLAGS_ENABLE_DIRECT_WRITE_NAME" desc="Name of the 'Enable DirectWrite' lab.">
- Enable DirectWrite
+ <message name="IDS_FLAGS_DISABLE_DIRECT_WRITE_NAME" desc="Name of the 'Disable DirectWrite' lab.">
+ Disable DirectWrite
</message>
- <message name="IDS_FLAGS_ENABLE_DIRECT_WRITE_DESCRIPTION" desc="Description of the 'Enable DirectWrite' lab.">
- Enables the use of experimental DirectWrite font rendering system.
+ <message name="IDS_FLAGS_DISABLE_DIRECT_WRITE_DESCRIPTION" desc="Description of the 'Disable DirectWrite' lab.">
+ Disables the use of experimental DirectWrite font rendering system.
</message>
</if>
<message name="IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME" desc="Name of the 'Enable experimental canvas features' lab.">
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 1a8ca47..832a9f1 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -519,11 +519,11 @@ const Experiment kExperiments[] = {
},
#if defined(OS_WIN)
{
- "enable-direct-write",
- IDS_FLAGS_ENABLE_DIRECT_WRITE_NAME,
- IDS_FLAGS_ENABLE_DIRECT_WRITE_DESCRIPTION,
+ "disable-direct-write",
+ IDS_FLAGS_DISABLE_DIRECT_WRITE_NAME,
+ IDS_FLAGS_DISABLE_DIRECT_WRITE_DESCRIPTION,
kOsWin,
- SINGLE_VALUE_TYPE(switches::kEnableDirectWrite)
+ SINGLE_VALUE_TYPE(switches::kDisableDirectWrite)
},
#endif
{
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 150ce1e..3e5730f 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1251,7 +1251,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
switches::kEnableSandboxLogging,
#endif
#if defined(OS_WIN)
- switches::kEnableDirectWrite,
+ switches::kDisableDirectWrite,
switches::kEnableHighResolutionTime,
#endif
};
diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc
index 04ad374..9432d24 100644
--- a/content/common/sandbox_win.cc
+++ b/content/common/sandbox_win.cc
@@ -568,7 +568,7 @@ bool ShouldUseDirectWrite() {
// 2670838, so a Win7 check is sufficient. We do not currently attempt to
// support Vista, where SP2 and the Platform Update are required.
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
- return command_line.HasSwitch(switches::kEnableDirectWrite) &&
+ return !command_line.HasSwitch(switches::kDisableDirectWrite) &&
base::win::GetVersion() >= base::win::VERSION_WIN7;
}
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 0db0de2..45f72a1 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -966,12 +966,12 @@ const char kDisableCoreAnimationPlugins[] =
// Device scale factor passed to certain processes like renderers, etc.
const char kDeviceScaleFactor[] = "device-scale-factor";
+// Disables the DirectWrite font rendering system on windows.
+const char kDisableDirectWrite[] = "disable-direct-write";
+
// Disable the Legacy Window which corresponds to the size of the WebContents.
const char kDisableLegacyIntermediateWindow[] = "disable-legacy-window";
-// Enables the DirectWrite font rendering system on windows.
-const char kEnableDirectWrite[] = "enable-direct-write";
-
// Use high resolution timers for TimeTicks.
const char kEnableHighResolutionTime[] = "enable-high-resolution-time";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index e2e3891..38e2c54 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -285,8 +285,8 @@ extern const char kDisableCoreAnimationPlugins[];
// This switch contains the device scale factor passed to certain processes
// like renderers, etc.
CONTENT_EXPORT extern const char kDeviceScaleFactor[];
+CONTENT_EXPORT extern const char kDisableDirectWrite[];
CONTENT_EXPORT extern const char kDisableLegacyIntermediateWindow[];
-CONTENT_EXPORT extern const char kEnableDirectWrite[];
CONTENT_EXPORT extern const char kEnableHighResolutionTime[];
// This switch will be removed when we enable the win32K lockdown process
// mitigation.