Apply hinting in SkiaTextRenderer::SetFontRenderParams().

ui/gfx/render_text.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/render_text.h"
 
 #include <algorithm>
 #include <climits>
 
 #include "base/command_line.h"
@@ skipping 187 matching lines @@
 void SkiaTextRenderer::SetDrawLooper(SkDrawLooper* draw_looper) {
   paint_.setLooper(draw_looper);
 }
 
 void SkiaTextRenderer::SetFontRenderParams(const FontRenderParams& params,
                                            bool background_is_transparent) {
   paint_.setAntiAlias(params.antialiasing);
   paint_.setLCDRenderText(!background_is_transparent &&
       params.subpixel_rendering != FontRenderParams::SUBPIXEL_RENDERING_NONE);
   paint_.setSubpixelText(params.subpixel_positioning);
-}
+  paint_.setAutohinted(params.autohinter);
 
-void SkiaTextRenderer::SetFontHinting(SkPaint::Hinting hinting) {
-  paint_.setHinting(hinting);
+  SkPaint::Hinting skia_hinting = SkPaint::kNormal_Hinting;
+  switch (params.hinting) {

[msw, 2014/07/11 00:29:10]

optional nit: add a helper to convert the enum (case x: return y).
(it's sad that we have separate gfx, skia, and content enums for this...)

[Daniel Erat, 2014/07/11 03:15:01]

sure, added the helper.

this makes me sad too. do you think that switching FontRenderParams to use the
skia enum for hinting would make sense?

(it'd be nice if the subpixel rendering enum could be unified too, but
FontRenderParams tracks the color component order too, while i think that
SkPaint just uses a bool -- maybe it tracks the order somewhere else.)

[msw, 2014/07/11 04:40:57]

That seems reasonable.
I'm not sure, but it may just assume RGB, I'm not sure how common BGR is.
SkBitmapDevice disables this if kN32_SkColorType != fBitmap.colorType().

+    case FontRenderParams::HINTING_NONE:
+      skia_hinting = SkPaint::kNo_Hinting;
+      break;
+    case FontRenderParams::HINTING_SLIGHT:
+      skia_hinting = SkPaint::kSlight_Hinting;
+      break;
+    case FontRenderParams::HINTING_MEDIUM:
+      skia_hinting = SkPaint::kNormal_Hinting;
+      break;
+    case FontRenderParams::HINTING_FULL:
+      skia_hinting = SkPaint::kFull_Hinting;
+      break;
+  }
+  paint_.setHinting(skia_hinting);
 }
 
 void SkiaTextRenderer::SetTypeface(SkTypeface* typeface) {
   paint_.setTypeface(typeface);
 }
 
 void SkiaTextRenderer::SetTextSize(SkScalar size) {
   paint_.setTextSize(size);
 }
 
@@ skipping 1131 matching lines @@
   cursor_bounds_ += delta_offset;
 }
 
 void RenderText::DrawSelection(Canvas* canvas) {
   const std::vector<Rect> sel = GetSubstringBounds(selection());
   for (std::vector<Rect>::const_iterator i = sel.begin(); i < sel.end(); ++i)
     canvas->FillRect(*i, selection_background_focused_color_);
 }
 
 }  // namespace gfx