Index: ui/gfx/render_text.cc |
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc |
index 89acc9401ab7f9b736fd34e7af0c6558c7defc82..db03b84fe9f54261f0690c8cc6636e2abd8263e4 100644 |
--- a/ui/gfx/render_text.cc |
+++ b/ui/gfx/render_text.cc |
@@ -205,8 +205,8 @@ void SkiaTextRenderer::SetDrawLooper(SkDrawLooper* draw_looper) { |
} |
void SkiaTextRenderer::SetFontRenderParams(const FontRenderParams& params, |
- bool background_is_transparent) { |
- ApplyRenderParams(params, background_is_transparent, &paint_); |
+ bool subpixel_rendering_enabled) { |
+ ApplyRenderParams(params, subpixel_rendering_enabled, &paint_); |
} |
void SkiaTextRenderer::SetTypeface(SkTypeface* typeface) { |
@@ -388,10 +388,10 @@ skia::RefPtr<SkTypeface> CreateSkiaTypeface(const std::string& family, |
} |
void ApplyRenderParams(const FontRenderParams& params, |
- bool background_is_transparent, |
+ bool subpixel_rendering_enabled, |
SkPaint* paint) { |
paint->setAntiAlias(params.antialiasing); |
- paint->setLCDRenderText(!background_is_transparent && |
+ paint->setLCDRenderText(subpixel_rendering_enabled && |
params.subpixel_rendering != FontRenderParams::SUBPIXEL_RENDERING_NONE); |
paint->setSubpixelText(params.subpixel_positioning); |
paint->setAutohinted(params.autohinter); |
@@ -403,6 +403,7 @@ void ApplyRenderParams(const FontRenderParams& params, |
RenderText::~RenderText() { |
} |
+// static |
RenderText* RenderText::CreateInstance() { |
#if defined(OS_MACOSX) |
static const bool use_native = |
@@ -414,6 +415,7 @@ RenderText* RenderText::CreateInstance() { |
return new RenderTextHarfBuzz; |
} |
+// static |
RenderText* RenderText::CreateInstanceForEditing() { |
return new RenderTextHarfBuzz; |
} |
@@ -920,7 +922,7 @@ RenderText::RenderText() |
text_elided_(false), |
min_line_height_(0), |
multiline_(false), |
- background_is_transparent_(false), |
+ subpixel_rendering_enabled_(true), |
clip_to_display_rect_(true), |
baseline_(kInvalidBaseline), |
cached_bounds_and_offset_valid_(false) { |