RenderTextHarfBuzz: Set font render parameters in font data functions

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 193 matching lines @@
     paint_.setXfermodeMode(SkXfermode::kDstIn_Mode);
     canvas_skia_->drawRect(bounds_, paint_);
     canvas_skia_->restore();
   }
 }
 
 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 functionality into
SetFontFamilyWithStyle (and/or SetTypeface), and add a
set_background_is_transparent instead?

[ckocagil, 2014/08/15 22:28:01]

We only call this on Win and Linux, so we have to put ifdefs around calls to
this function. Merging it into SetFontFamilyWithStyle would make that awkward.

                                            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) {
   paint_.setTypeface(typeface);
 }
 
 void SkiaTextRenderer::SetTextSize(SkScalar size) {
   paint_.setTextSize(size);
 }
 
@@ skipping 177 matching lines @@
 Line::Line() : preceding_heights(0), baseline(0) {}
 
 Line::~Line() {}
 
 skia::RefPtr<SkTypeface> CreateSkiaTypeface(const std::string& family,
                                             int style) {
   SkTypeface::Style skia_style = ConvertFontStyleToSkiaTypefaceStyle(style);
   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() {
 }
 
 RenderText* RenderText::CreateInstance() {
 #if defined(OS_MACOSX) && defined(TOOLKIT_VIEWS)
   // Use the more complete HarfBuzz implementation for Views controls on Mac.
   return new RenderTextHarfBuzz;
 #else
@@ skipping 996 matching lines @@
   SetDisplayOffset(display_offset_.x() + delta_x);
 }
 
 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