linux: Use subpixel positioning for forced scale factor.

ui/gfx/font_render_params_linux.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/font_render_params_linux.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/switches.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #else
 #include <fontconfig/fontconfig.h>
 #endif
 
 #if defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)
 #include "ui/gfx/linux_font_delegate.h"
 #endif
 
 namespace gfx {
 
 namespace {
 
 bool SubpixelPositioningRequested(bool renderer) {
+  if (renderer) {
+    return CommandLine::ForCurrentProcess()->HasSwitch(

[Alexei Svitkine (slow), 2014/04/09 20:43:23]

Nit: Extract CommandLine::ForCurrentProcess() into a local var to make this part
more concise. It can be above the if since it's also used below.

[Daniel Erat, 2014/04/09 21:03:11]

Done.

+               switches::kEnableWebkitTextSubpixelPositioning) ||
+           (Display::HasForceDeviceScaleFactor() &&

[Alexei Svitkine (slow), 2014/04/09 20:43:23]

Nit: Could you add a comment explaining the motivation behind this logic here?

[Daniel Erat, 2014/04/09 21:03:11]

Done.

+            Display::GetForcedDeviceScaleFactor() != 1.0);
+  }
   return CommandLine::ForCurrentProcess()->HasSwitch(
-      renderer ?
-      switches::kEnableWebkitTextSubpixelPositioning :
       switches::kEnableBrowserTextSubpixelPositioning);
 }
 
 // Initializes |params| with the system's default settings. |renderer| is true
 // when setting WebKit renderer defaults.
 void LoadDefaults(FontRenderParams* params, bool renderer) {
 #if defined(TOOLKIT_GTK)
   params->antialiasing = true;
   // TODO(wangxianzhu): autohinter is now true to keep original behavior
   // of WebKit, but it might not be the best value.
@@ skipping 115 matching lines @@
     LoadDefaults(&default_params, /* renderer */ true);
   loaded_defaults = true;
   return default_params;
 }
 
 bool GetDefaultWebkitSubpixelPositioning() {
   return SubpixelPositioningRequested(true);
 }
 
 }  // namespace gfx