| Index: ui/gfx/render_text.cc
|
| diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc
|
| index fb7364b66f2b538f5733867b11afc11330755c6d..c67c65929956d24acae269dc37bb4bb521e6921b 100644
|
| --- a/ui/gfx/render_text.cc
|
| +++ b/ui/gfx/render_text.cc
|
| @@ -156,6 +156,19 @@ 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(
|
| + 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;
|
| + }
|
| + return SkPaint::kNo_Hinting;
|
| +}
|
| +
|
| } // namespace
|
|
|
| namespace internal {
|
| @@ -205,10 +218,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) {
|
|
|