RenderTextHarfBuzz: Try fallback fonts of the Uniscribe font while shaping

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 <map>
 
 #include "base/i18n/bidi_line_iterator.h"
@@ skipping 1086 matching lines @@
   FontRenderParams best_render_params;
   size_t best_missing_glyphs = std::numeric_limits<size_t>::max();
 
   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;
+  bool got_uniscribe_font = false;
   const base::char16* run_text = &(GetLayoutText()[run->range.start()]);
   if (GetUniscribeFallbackFont(primary_font, run_text, run->range.length(),
-                               &uniscribe_font) &&
-      CompareFamily(run, uniscribe_font.GetFontName(),
-                    uniscribe_font.GetFontRenderParams(),
-                    &best_family, &best_render_params, &best_missing_glyphs))
-    return;
+                               &uniscribe_font)) {
+    got_uniscribe_font = true;
+    if (CompareFamily(run, uniscribe_font.GetFontName(),
+                      uniscribe_font.GetFontRenderParams(),
+                      &best_family, &best_render_params, &best_missing_glyphs))
+      return;
+  }
+#endif
+
+  std::vector<std::string> fallback_families =
+      GetFallbackFontFamilies(primary_font.GetFontName());
+
+#if defined(OS_WIN)
+  // Append fonts in the fallback list of the Uniscribe font.
+  if (got_uniscribe_font) {
+    std::vector<std::string> uniscribe_fallbacks =
+        GetFallbackFontFamilies(uniscribe_font.GetFontName());
+    fallback_families.insert(fallback_families.end(),
+        uniscribe_fallbacks.begin(), uniscribe_fallbacks.end());

[Daniel Erat, 2014/10/28 14:32:59]

patch set 2 skipped the first uniscribe fallback font, but this version doesn't
appear to. do you need to? i.e. does GetFallbackFontFamilies() also return
|uniscribe_font| in the first position here?

render_text_win.cc also skip the first uniscribe fallback font, so i suspect you
may need to update the range that you insert here. it'd probably be cleaner to
also update the earlier |fallback_families| assignment as well so the loop below
doesn't need to start at index 1.

[ckocagil, 2014/10/28 17:39:04]

Yes, fixed.
That'd require shifting vector elements which I'd like to avoid here.

+  }
 #endif
 
   // 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;
   }
@@ skipping 61 matching lines @@
       run->width = std::floor(run->width + 0.5f);
 #endif
   }
 
   hb_buffer_destroy(buffer);
   hb_font_destroy(harfbuzz_font);
   return true;
 }
 
 }  // namespace gfx