Font fallback for UI

ui/gfx/render_text_harfbuzz.cc

 // Copyright 2014 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_harfbuzz.h"
 
 #include <limits>
 #include <set>
 
 #include "base/i18n/bidi_line_iterator.h"
@@ skipping 1375 matching lines @@
   FontRenderParams best_render_params;
   size_t best_missing_glyphs = std::numeric_limits<size_t>::max();
 
   for (const Font& font : font_list().GetFonts()) {
     if (CompareFamily(text, font, font.GetFontRenderParams(), run, &best_font,
                       &best_render_params, &best_missing_glyphs))
       return;
   }
 
 #if defined(OS_WIN)
-  Font uniscribe_font(primary_font);
-  std::string uniscribe_family;
+  Font fallback_font(primary_font);
+  std::string fallback_family;
   const base::char16* run_text = &(text[run->range.start()]);
-  if (GetUniscribeFallbackFont(primary_font, run_text, run->range.length(),
-                               &uniscribe_font)) {
-    uniscribe_family = uniscribe_font.GetFontName();
-    if (CompareFamily(text, uniscribe_font,
-                      uniscribe_font.GetFontRenderParams(), run,
-                      &best_font, &best_render_params, &best_missing_glyphs))
+  if (GetFallbackFont(primary_font, run_text, run->range.length(),
+                      &fallback_font)) {
+    fallback_family = fallback_font.GetFontName();
+    if (CompareFamily(text, fallback_font, fallback_font.GetFontRenderParams(),
+                      run, &best_font, &best_render_params,
+                      &best_missing_glyphs))
       return;
   }
 #endif
 
   std::vector<Font> fallback_font_list = GetFallbackFonts(primary_font);
 
 #if defined(OS_WIN)
-  // Append fonts in the fallback list of the Uniscribe font.
-  if (!uniscribe_family.empty()) {
-    std::vector<Font> uniscribe_fallbacks = GetFallbackFonts(uniscribe_font);
-    fallback_font_list.insert(fallback_font_list.end(),
-        uniscribe_fallbacks.begin(), uniscribe_fallbacks.end());
+  // Append fonts in the fallback list of the fallback font.
+  if (!fallback_family.empty()) {
+    std::vector<Font> fallback_fonts = GetFallbackFonts(fallback_font);
+    fallback_font_list.insert(fallback_font_list.end(), fallback_fonts.begin(),
+                              fallback_fonts.end());
   }
 
   // Add Segoe UI and its associated linked fonts to the fallback font list to
   // ensure that the fallback list covers the basic cases.
   // http://crbug.com/467459. On some Windows configurations the default font
   // could be a raster font like System, which would not give us a reasonable
   // fallback font list.
   if (!base::LowerCaseEqualsASCII(primary_font.GetFontName(), "segoe ui") &&
-      !base::LowerCaseEqualsASCII(uniscribe_family, "segoe ui")) {
+      !base::LowerCaseEqualsASCII(fallback_family, "segoe ui")) {
     std::vector<Font> default_fallback_families =
         GetFallbackFonts(Font("Segoe UI", 13));
     fallback_font_list.insert(fallback_font_list.end(),
         default_fallback_families.begin(), default_fallback_families.end());
   }
 #endif
 
   // Use a set to track the fallback fonts and avoid duplicate entries.
   std::set<Font, CaseInsensitiveCompare> fallback_fonts;
 
   // Try shaping with the fallback fonts.
   for (const auto& font : fallback_font_list) {
     std::string font_name = font.GetFontName();
 
     if (font_name == primary_font.GetFontName())
       continue;
 #if defined(OS_WIN)
-    if (font_name == uniscribe_family)
+    if (font_name == fallback_family)
       continue;
 #endif
     if (fallback_fonts.find(font) != fallback_fonts.end())
       continue;
 
     fallback_fonts.insert(font);
 
     FontRenderParamsQuery query;
     query.families.push_back(font_name);
     query.pixel_size = run->font_size;
@@ skipping 130 matching lines @@
   DCHECK(!update_layout_run_list_);
   DCHECK(!update_display_run_list_);
   return text_elided() ? display_run_list_.get() : &layout_run_list_;
 }
 
 const internal::TextRunList* RenderTextHarfBuzz::GetRunList() const {
   return const_cast<RenderTextHarfBuzz*>(this)->GetRunList();
 }
 
 }  // namespace gfx