Index: ui/gfx/render_text.cc |
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc |
index 807f8cd12ebe8d5b2579c25df00b65947789bc13..615c7aa9aaa98a1ac20cbb19319ffc0e75058baf 100644 |
--- a/ui/gfx/render_text.cc |
+++ b/ui/gfx/render_text.cc |
@@ -211,14 +211,11 @@ void SkiaTextRenderer::SetDrawLooper(SkDrawLooper* draw_looper) { |
paint_.setLooper(draw_looper); |
} |
-void SkiaTextRenderer::SetFontRenderParams(const FontRenderParams& params, |
+void SkiaTextRenderer::SetFontRenderParams(FontRenderParams params, |
msw
2014/08/15 19:21:17
Can we remove this function, inline its functional
ckocagil
2014/08/15 22:28:01
We only call this on Win and Linux, so we have to
|
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); |
- paint_.setHinting(FontRenderParamsHintingToSkPaintHinting(params.hinting)); |
+ if (background_is_transparent) |
+ params.subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_NONE; |
+ ApplyRenderParams(params, &paint_); |
} |
void SkiaTextRenderer::SetTypeface(SkTypeface* typeface) { |
@@ -416,6 +413,15 @@ skia::RefPtr<SkTypeface> CreateSkiaTypeface(const std::string& family, |
return skia::AdoptRef(SkTypeface::CreateFromName(family.c_str(), skia_style)); |
} |
+void ApplyRenderParams(const FontRenderParams& params, SkPaint* paint) { |
+ paint->setAntiAlias(params.antialiasing); |
+ paint->setLCDRenderText( |
+ params.subpixel_rendering != FontRenderParams::SUBPIXEL_RENDERING_NONE); |
+ paint->setSubpixelText(params.subpixel_positioning); |
+ paint->setAutohinted(params.autohinter); |
+ paint->setHinting(FontRenderParamsHintingToSkPaintHinting(params.hinting)); |
+} |
+ |
} // namespace internal |
RenderText::~RenderText() { |