Index: ui/gfx/render_text.cc |
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc |
index fb7364b66f2b538f5733867b11afc11330755c6d..e03a2fed3c08d26c897b6da3d3813ad2c2adcda2 100644 |
--- a/ui/gfx/render_text.cc |
+++ b/ui/gfx/render_text.cc |
@@ -156,6 +156,18 @@ skia::RefPtr<SkShader> CreateFadeShader(const Rect& text_rect, |
colors.size(), SkShader::kClamp_TileMode)); |
} |
+// Converts a FontRenderParams::Hinting value to the corresponding |
+// SkPaint::Hinting value. |
+SkPaint::Hinting FontRenderParamsHintingToSkPaintHinting( |
msw
2014/07/11 04:40:57
You'll need a return statement after the switch.
Daniel Erat
2014/07/11 13:13:45
whoops, of course. done.
|
+ FontRenderParams::Hinting params_hinting) { |
+ switch (params_hinting) { |
+ case FontRenderParams::HINTING_NONE: return SkPaint::kNo_Hinting; |
+ case FontRenderParams::HINTING_SLIGHT: return SkPaint::kSlight_Hinting; |
+ case FontRenderParams::HINTING_MEDIUM: return SkPaint::kNormal_Hinting; |
+ case FontRenderParams::HINTING_FULL: return SkPaint::kFull_Hinting; |
+ } |
+} |
+ |
} // namespace |
namespace internal { |
@@ -205,10 +217,8 @@ void SkiaTextRenderer::SetFontRenderParams(const FontRenderParams& params, |
paint_.setLCDRenderText(!background_is_transparent && |
params.subpixel_rendering != FontRenderParams::SUBPIXEL_RENDERING_NONE); |
paint_.setSubpixelText(params.subpixel_positioning); |
-} |
- |
-void SkiaTextRenderer::SetFontHinting(SkPaint::Hinting hinting) { |
- paint_.setHinting(hinting); |
+ paint_.setAutohinted(params.autohinter); |
+ paint_.setHinting(FontRenderParamsHintingToSkPaintHinting(params.hinting)); |
} |
void SkiaTextRenderer::SetTypeface(SkTypeface* typeface) { |