Re-land: RenderTextHarfBuzz: Set font render parameters in font data functions

ui/gfx/font_render_params_mac.cc

Index: ui/gfx/font_render_params_mac.cc
diff --git a/ui/gfx/font_render_params_android.cc b/ui/gfx/font_render_params_mac.cc
similarity index 56%
copy from ui/gfx/font_render_params_android.cc
copy to ui/gfx/font_render_params_mac.cc
index c5b17b0304f1a76a8731295a09632cf5cede3737..0062f3b1aae2fcdcbc3eb53d970449a74cdcbe9c 100644
--- a/ui/gfx/font_render_params_android.cc
+++ b/ui/gfx/font_render_params_mac.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
@@ -11,19 +11,15 @@ namespace gfx {
 
 namespace {
 
-// Returns the system's default settings.
+// Returns params that match SkiaTextRenderer's default render settings.
 FontRenderParams LoadDefaults() {
   FontRenderParams params;
   params.antialiasing = true;
-  params.autohinter = true;
+  params.autohinter = false;
   params.use_bitmaps = true;
-  params.subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_NONE;
-
-  // Use subpixel text positioning to keep consistent character spacing when
-  // the page is scaled by a fractional factor.
+  params.subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_RGB;
   params.subpixel_positioning = true;
-  // Slight hinting renders much better than normal hinting on Android.
-  params.hinting = FontRenderParams::HINTING_SLIGHT;
+  params.hinting = FontRenderParams::HINTING_MEDIUM;
 
   return params;
 }
@@ -32,11 +28,10 @@ FontRenderParams LoadDefaults() {
 
 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
                                      std::string* family_out) {
-  // Customized font rendering settings are not supported, only defaults.
+  // TODO: Query the OS for font render settings instead of returning defaults.
   if (!query.is_empty() || family_out)
     NOTIMPLEMENTED();
-  CR_DEFINE_STATIC_LOCAL(
-      const gfx::FontRenderParams, params, (LoadDefaults()));
+  CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, (LoadDefaults()));
   return params;
 }