Avoid extra FontRenderParams queries in RenderTextHarfBuzz.

gfx::Font already contains a FontRenderParams struct. Make
RenderTextHarfBuzz use it when possible instead of always
querying for a new struct.

BUG=none

Review URL: https://codereview.chromium.org/674683003

Cr-Commit-Position: refs/heads/master@{#301101}

ui/gfx/render_text_harfbuzz.cc

@@ -1070,82 +1070,83 @@ void RenderTextHarfBuzz::ItemizeText() {
   ubidi_reorderLogical(&levels[0], num_runs, &logical_to_visual_[0]);
 }
 
+bool RenderTextHarfBuzz::CompareFamily(
+    internal::TextRunHarfBuzz* run,
+    const std::string& family,
+    const gfx::FontRenderParams& render_params,
+    std::string* best_family,
+    gfx::FontRenderParams* best_render_params,
+    size_t* best_missing_glyphs) {
+  if (!ShapeRunWithFont(run, family, render_params))
+    return false;
+
+  const size_t missing_glyphs = run->CountMissingGlyphs();
+  if (missing_glyphs < *best_missing_glyphs) {
+    *best_family = family;
+    *best_render_params = render_params;
+    *best_missing_glyphs = missing_glyphs;
+  }
+  return missing_glyphs == 0;
+}
+
 void RenderTextHarfBuzz::ShapeRun(internal::TextRunHarfBuzz* run) {
   const Font& primary_font = font_list().GetPrimaryFont();
-  const std::string primary_font_name = primary_font.GetFontName();
   run->font_size = primary_font.GetFontSize();
 
-  size_t best_font_missing = std::numeric_limits<size_t>::max();
-  std::string best_font;
-  std::string current_font;
+  std::string best_family;
+  FontRenderParams best_render_params;
+  size_t best_missing_glyphs = std::numeric_limits<size_t>::max();
 
-  // Try shaping with |primary_font|.
-  if (ShapeRunWithFont(run, primary_font_name)) {
-    current_font = primary_font_name;
-    size_t current_missing = run->CountMissingGlyphs();
-    if (current_missing == 0)
-      return;
-    if (current_missing < best_font_missing) {
-      best_font_missing = current_missing;
-      best_font = current_font;
-    }
-  }
+  if (CompareFamily(run, primary_font.GetFontName(),
+                    primary_font.GetFontRenderParams(),
+                    &best_family, &best_render_params, &best_missing_glyphs))
+    return;
 
 #if defined(OS_WIN)
   Font uniscribe_font;
   const base::char16* run_text = &(GetLayoutText()[run->range.start()]);
   if (GetUniscribeFallbackFont(primary_font, run_text, run->range.length(),
                                &uniscribe_font) &&
-      ShapeRunWithFont(run, uniscribe_font.GetFontName())) {
-    current_font = uniscribe_font.GetFontName();
-    size_t current_missing = run->CountMissingGlyphs();
-    if (current_missing == 0)
-      return;
-    if (current_missing < best_font_missing) {
-      best_font_missing = current_missing;
-      best_font = current_font;
-    }
-  }
+      CompareFamily(run, uniscribe_font.GetFontName(),
+                    uniscribe_font.GetFontRenderParams(),
+                    &best_family, &best_render_params, &best_missing_glyphs))
+    return;
 #endif
 
-  // Try shaping with the fonts in the fallback list except the first, which is
-  // |primary_font|.
-  std::vector<std::string> fonts = GetFallbackFontFamilies(primary_font_name);
-  for (size_t i = 1; i < fonts.size(); ++i) {
-    if (!ShapeRunWithFont(run, fonts[i]))
-      continue;
-    current_font = fonts[i];
-    size_t current_missing = run->CountMissingGlyphs();
-    if (current_missing == 0)
+  // Skip the first fallback font, which is |primary_font|.
+  std::vector<std::string> fallback_families =
+      GetFallbackFontFamilies(primary_font.GetFontName());
+  for (size_t i = 1; i < fallback_families.size(); ++i) {
+    FontRenderParamsQuery query(false);
+    query.families.push_back(fallback_families[i]);
+    query.pixel_size = run->font_size;
+    query.style = run->font_style;
+    FontRenderParams fallback_render_params = GetFontRenderParams(query, NULL);
+    if (CompareFamily(run, fallback_families[i], fallback_render_params,
+                      &best_family, &best_render_params, &best_missing_glyphs))
       return;
-    if (current_missing < best_font_missing) {
-      best_font_missing = current_missing;
-      best_font = current_font;
-    }
   }
 
-  if (!best_font.empty() &&
-      (best_font == current_font || ShapeRunWithFont(run, best_font))) {
+  if (!best_family.empty() &&
+      (best_family == run->family ||
+       ShapeRunWithFont(run, best_family, best_render_params)))
     return;
-  }
 
   run->glyph_count = 0;
   run->width = 0.0f;
 }
 
 bool RenderTextHarfBuzz::ShapeRunWithFont(internal::TextRunHarfBuzz* run,
-                                          const std::string& font_family) {
+                                          const std::string& font_family,
+                                          const FontRenderParams& params) {
   const base::string16& text = GetLayoutText();
   skia::RefPtr<SkTypeface> skia_face =
       internal::CreateSkiaTypeface(font_family, run->font_style);
   if (skia_face == NULL)
     return false;
   run->skia_face = skia_face;
-  FontRenderParamsQuery query(false);
-  query.families.push_back(font_family);
-  query.pixel_size = run->font_size;
-  query.style = run->font_style;
-  run->render_params = GetFontRenderParams(query, NULL);
+  run->family = font_family;
+  run->render_params = params;
   hb_font_t* harfbuzz_font = CreateHarfBuzzFont(
       run->skia_face.get(), SkIntToScalar(run->font_size), run->render_params,
       background_is_transparent());

ui/gfx/render_text_harfbuzz.h

@@ -60,6 +60,7 @@ struct GFX_EXPORT TextRunHarfBuzz {
   std::vector<uint32> glyph_to_char;
   size_t glyph_count;
 
+  std::string family;
   skia::RefPtr<SkTypeface> skia_face;
   FontRenderParams render_params;
   int font_size;
@@ -127,10 +128,23 @@ class GFX_EXPORT RenderTextHarfBuzz : public RenderText {
   // Break the text into logical runs and populate the visual <-> logical maps.
   void ItemizeText();
 
+  // Helper method for ShapeRun() that calls ShapeRunWithFont() with |run|,
+  // |family|, and |render_params|, returning true if the family provides all
+  // needed glyphs and false otherwise. Additionally updates |best_family|,
+  // |best_render_params|, and |best_missing_glyphs| if |family| has fewer than
+  // |best_missing_glyphs| missing glyphs.
+  bool CompareFamily(internal::TextRunHarfBuzz* run,
+                     const std::string& family,
+                     const gfx::FontRenderParams& render_params,
+                     std::string* best_family,
+                     gfx::FontRenderParams* best_render_params,
+                     size_t* best_missing_glyphs);
+
   // Shape the glyphs needed for the text |run|.
   void ShapeRun(internal::TextRunHarfBuzz* run);
   bool ShapeRunWithFont(internal::TextRunHarfBuzz* run,
-                        const std::string& font);
+                        const std::string& font_family,
+                        const FontRenderParams& params);
 
   // Text runs in logical order.
   ScopedVector<internal::TextRunHarfBuzz> runs_;

ui/gfx/render_text_unittest.cc

@@ -15,6 +15,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/break_list.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/font.h"
 #include "ui/gfx/render_text_harfbuzz.h"
 
 #if defined(OS_WIN)
@@ -2287,7 +2288,8 @@ TEST_F(RenderTextTest, HarfBuzz_NonExistentFont) {
   render_text.EnsureLayout();
   ASSERT_EQ(1U, render_text.runs_.size());
   internal::TextRunHarfBuzz* run = render_text.runs_[0];
-  render_text.ShapeRunWithFont(run, "TheFontThatDoesntExist");
+  render_text.ShapeRunWithFont(
+      run, "TheFontThatDoesntExist", FontRenderParams());
 }
 
 // Ensure an empty run returns sane values to queries.