Enable DirectWrite by default

Flips the sense of the flag for now. If all seems OK as we move through
channels, I will remove it later.

R=cpu@chromium.org, jam@chromium.org
BUG=25541

Review URL: https://codereview.chromium.org/323563005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275860 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 6 insertions, 6 deletions

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.