ui/gfx: Allow for font-specific rendering settings.

ui/gfx/pango_util.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/pango_util.h"
 
 #include <cairo/cairo.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
 #include <string>
 
 #include <algorithm>
 #include <map>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/font_render_params.h"
+#include "ui/gfx/platform_font_pango.h"
 #include "ui/gfx/text_utils.h"
 
 namespace gfx {
 
 namespace {
 
 // Marker for accelerators in the text.
 const gunichar kAcceleratorChar = '&';
 
 // Creates and returns a PangoContext. The caller owns the context.
 PangoContext* GetPangoContext() {
   PangoFontMap* font_map = pango_cairo_font_map_get_default();
   return pango_font_map_create_context(font_map);
 }
 
-// Returns a static cairo_font_options_t. If needed, allocates and updates it.
-// TODO(derat): Return font-specific options: http://crbug.com/125235
-cairo_font_options_t* GetCairoFontOptions() {
-  // Font settings that we initialize once and then use when drawing text.
-  static cairo_font_options_t* cairo_font_options = NULL;
-  if (cairo_font_options)
-    return cairo_font_options;
+// Creates a new cairo_font_options_t based on |params|.
+cairo_font_options_t* CreateCairoFontOptions(const FontRenderParams& params) {
+  cairo_font_options_t* cairo_font_options = cairo_font_options_create();
 
-  cairo_font_options = cairo_font_options_create();
-
-  const FontRenderParams& params = GetDefaultFontRenderParams();
   FontRenderParams::SubpixelRendering subpixel = params.subpixel_rendering;
   if (!params.antialiasing) {
     cairo_font_options_set_antialias(cairo_font_options, CAIRO_ANTIALIAS_NONE);
   } else if (subpixel == FontRenderParams::SUBPIXEL_RENDERING_NONE) {
     cairo_font_options_set_antialias(cairo_font_options, CAIRO_ANTIALIAS_GRAY);
   } else {
     cairo_font_options_set_antialias(cairo_font_options,
                                      CAIRO_ANTIALIAS_SUBPIXEL);
     cairo_subpixel_order_t cairo_subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
     if (subpixel == FontRenderParams::SUBPIXEL_RENDERING_RGB)
@@ skipping 70 matching lines @@
 }
 
 }  // namespace
 
 void SetUpPangoLayout(
     PangoLayout* layout,
     const base::string16& text,
     const FontList& font_list,
     base::i18n::TextDirection text_direction,
     int flags) {
-  // TODO(derat): Use rendering parameters from |font_list| instead of defaults.
-  cairo_font_options_t* cairo_font_options = GetCairoFontOptions();
+  cairo_font_options_t* cairo_font_options =
+      CreateCairoFontOptions(font_list.GetFontRenderParams());
 
-  // If we got an explicit request to turn off subpixel rendering, disable it on
-  // a copy of the static font options object.
-  bool copied_cairo_font_options = false;
+  // If we got an explicit request to turn off subpixel rendering, disable it.
   if ((flags & Canvas::NO_SUBPIXEL_RENDERING) &&
       (cairo_font_options_get_antialias(cairo_font_options) ==
-       CAIRO_ANTIALIAS_SUBPIXEL)) {
-    cairo_font_options = cairo_font_options_copy(cairo_font_options);
-    copied_cairo_font_options = true;
+       CAIRO_ANTIALIAS_SUBPIXEL))
     cairo_font_options_set_antialias(cairo_font_options, CAIRO_ANTIALIAS_GRAY);
-  }
 
   // This needs to be done early on; it has no effect when called just before
   // pango_cairo_show_layout().
   pango_cairo_context_set_font_options(
       pango_layout_get_context(layout), cairo_font_options);
-
-  if (copied_cairo_font_options) {
-    cairo_font_options_destroy(cairo_font_options);
-    cairo_font_options = NULL;
-  }
+  cairo_font_options_destroy(cairo_font_options);
+  cairo_font_options = NULL;
 
   // Set Pango's base text direction explicitly from |text_direction|.
   pango_layout_set_auto_dir(layout, FALSE);
   pango_context_set_base_dir(pango_layout_get_context(layout),
       (text_direction == base::i18n::RIGHT_TO_LEFT ?
        PANGO_DIRECTION_RTL : PANGO_DIRECTION_LTR));
 
   if (flags & Canvas::TEXT_ALIGN_CENTER) {
     // We don't support center aligned w/ eliding.
     DCHECK(gfx::Canvas::NO_ELLIPSIS);
@@ skipping 90 matching lines @@
 
   if (i == desc_to_metrics->end()) {
     PangoFontMetrics* metrics = pango_context_get_metrics(context, desc, NULL);
     desc_to_metrics->insert(std::make_pair(desc_hash, metrics));
     return metrics;
   }
   return i->second;
 }
 
 }  // namespace gfx