Add FontRenderParamsQuery.

ui/gfx/platform_font_pango.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/platform_font_pango.h"
 
 #include <fontconfig/fontconfig.h>
 #include <pango/pango.h>
 
 #include <algorithm>
@@ skipping 76 matching lines @@
     if (!description || !description->get())
       description.reset(new ScopedPangoFontDescription("sans 10"));
     default_font_ = new Font(description->get());
   }
 
   InitFromPlatformFont(
       static_cast<PlatformFontPango*>(default_font_->platform_font()));
 }
 
 PlatformFontPango::PlatformFontPango(NativeFont native_font) {
-  std::string font_family;
-  std::vector<std::string> family_names;
+  FontRenderParamsQuery query(false);
   base::SplitString(pango_font_description_get_family(native_font), ',',
-                    &family_names);
+                    &query.families);
 
   const int pango_size =
       pango_font_description_get_size(native_font) / PANGO_SCALE;
-  const bool pango_using_pixels =
-      pango_font_description_get_size_is_absolute(native_font);
+  if (pango_font_description_get_size_is_absolute(native_font))
+    query.pixel_size = pango_size;
+  else
+    query.point_size = pango_size;
 
-  int style = 0;
+  query.style = gfx::Font::NORMAL;
   // TODO(davemoore) What should we do about other weights? We currently only

[msw, 2014/07/23 22:16:35]

nit: one-liner "TODO(davemoore) Support weights other than BOLD?"

[Daniel Erat, 2014/07/23 22:47:18]

Done.

   // support BOLD.
   if (pango_font_description_get_weight(native_font) == PANGO_WEIGHT_BOLD)
-    style |= gfx::Font::BOLD;
+    query.style |= gfx::Font::BOLD;
   // TODO(davemoore) What about PANGO_STYLE_OBLIQUE?
   if (pango_font_description_get_style(native_font) == PANGO_STYLE_ITALIC)
-    style |= gfx::Font::ITALIC;
+    query.style |= gfx::Font::ITALIC;
 
-  const FontRenderParams params = GetCustomFontRenderParams(
-      false, &family_names,
-      pango_using_pixels ? &pango_size : NULL /* pixel_size */,
-      !pango_using_pixels ? &pango_size : NULL /* point_size */,
-      &style, &font_family);
-
+  std::string font_family;
+  const FontRenderParams params = gfx::GetFontRenderParams(query, &font_family);

[msw, 2014/07/23 22:16:35]

nit: maybe inline this below?

[Daniel Erat, 2014/07/23 22:47:18]

seems scary since it updates |font_family|, which is another argument to
InitFromDetails (we're passing a reference, so i think it'd be okay, but
still...)

[msw, 2014/07/23 22:54:31]

Acknowledged.

   InitFromDetails(skia::RefPtr<SkTypeface>(), font_family,
-                  gfx::GetPangoFontSizeInPixels(native_font), style, params);
+                  gfx::GetPangoFontSizeInPixels(native_font),
+                  query.style, params);
 }
 
 PlatformFontPango::PlatformFontPango(const std::string& font_name,
                                      int font_size_pixels) {
-  const std::vector<std::string> font_list(1, font_name);
-  const int style = Font::NORMAL;
-  const FontRenderParams params = GetCustomFontRenderParams(
-      false, &font_list, &font_size_pixels, NULL, &style, NULL);
+  FontRenderParamsQuery query(false);
+  query.families.push_back(font_name);
+  query.pixel_size = font_size_pixels;
+  query.style = gfx::Font::NORMAL;

[msw, 2014/07/23 22:16:35]

Should this omit the style from the query if it's unknown, or is it right to
assume that the caller requires a 'normal' style font? Either seems reasonable
to me, I'm just asking. (you may have asked a related question in an earlier
patch set, but I can't find it with a quick search)

[Daniel Erat, 2014/07/23 22:47:18]

i think that requesting normal here is the right thing to do, since that's what
gfx::Font is using and how it'll be rendered. the not-including-style-in-query
thing is really just useful when getting defaults, in my mind.

[msw, 2014/07/23 22:54:31]

Acknowledged.

+  const FontRenderParams params = gfx::GetFontRenderParams(query, NULL);

[msw, 2014/07/23 22:16:35]

nit: maybe inline this below?

[Daniel Erat, 2014/07/23 22:47:18]

Done.

   InitFromDetails(skia::RefPtr<SkTypeface>(), font_name, font_size_pixels,
-                  style, params);
+                  query.style, params);
 }
 
 double PlatformFontPango::underline_position() const {
   const_cast<PlatformFontPango*>(this)->InitPangoMetrics();
   return underline_position_pixels_;
 }
 
 double PlatformFontPango::underline_thickness() const {
   const_cast<PlatformFontPango*>(this)->InitPangoMetrics();
   return underline_thickness_pixels_;
@@ skipping 20 matching lines @@
 
 Font PlatformFontPango::DeriveFont(int size_delta, int style) const {
   const int new_size = font_size_pixels_ + size_delta;
   DCHECK_GT(new_size, 0);
 
   // If the style changed, we may need to load a new face.
   std::string new_family = font_family_;
   skia::RefPtr<SkTypeface> typeface =
       (style == style_) ? typeface_ : CreateSkTypeface(style, &new_family);
 
-  const std::vector<std::string> family_list(1, new_family);
-  const FontRenderParams render_params = GetCustomFontRenderParams(
-      false, &family_list, &new_size, NULL, &style, NULL);
+  FontRenderParamsQuery query(false);
+  query.families.push_back(new_family);
+  query.pixel_size = new_size;
+  query.style = style;
+  const FontRenderParams render_params = gfx::GetFontRenderParams(query, NULL);

[msw, 2014/07/23 22:16:35]

nit: maybe inline this below?

[Daniel Erat, 2014/07/23 22:47:18]

Done.

 
   return Font(new PlatformFontPango(typeface,
                                     new_family,
                                     new_size,
                                     style,
                                     render_params));
 }
 
 int PlatformFontPango::GetHeight() const {
   return height_pixels_;
@@ skipping 183 matching lines @@
   return new PlatformFontPango(native_font);
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name,
                                                   int font_size) {
   return new PlatformFontPango(font_name, font_size);
 }
 
 }  // namespace gfx