Reland: Use FontFallbackPriority Fonts in FontFallbackIterator

third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h

Index: third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
diff --git a/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h b/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
index 4e054bb7ac6ec42461695c493c83c16fb226267d..643b805fc9599264e6cdee5bedb8026ff396c88d 100644
--- a/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
+++ b/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
@@ -6,6 +6,7 @@
 #define FontFallbackIterator_h
 
 #include "platform/fonts/FontDataRange.h"
+#include "platform/fonts/FontFallbackPriority.h"
 #include "wtf/HashMap.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
@@ -27,7 +28,8 @@ class FontFallbackIterator : public RefCounted<FontFallbackIterator> {
     WTF_MAKE_NONCOPYABLE(FontFallbackIterator);
 
 public:
-    static PassRefPtr<FontFallbackIterator> create(const FontDescription&, PassRefPtr<FontFallbackList>);
+    static PassRefPtr<FontFallbackIterator> create(const FontDescription&, PassRefPtr<FontFallbackList>,
+        FontFallbackPriority);
 
     // Returns whether a list of all remaining characters to be shaped is
     // needed.  Needed by the FontfallbackIterator in order to check whether a
@@ -42,11 +44,13 @@ public:
     const FontDataRange next(const Vector<UChar32>& hintList);
 
 private:
-    FontFallbackIterator(const FontDescription&, PassRefPtr<FontFallbackList>);
+    FontFallbackIterator(const FontDescription&, PassRefPtr<FontFallbackList>,
+        FontFallbackPriority);
     bool rangeContributesForHint(const Vector<UChar32> hintList, const FontDataRange&);
     bool alreadyLoadingRangeForHintChar(UChar32 hintChar);
     void willUseRange(const AtomicString& family, const FontDataRange&);
 
+    const PassRefPtr<SimpleFontData> fallbackPriorityFont(UChar32 hint);
     const PassRefPtr<SimpleFontData> uniqueSystemFontForHint(UChar32 hint);
 
     const FontDescription& m_fontDescription;
@@ -55,6 +59,7 @@ private:
     unsigned m_segmentedIndex;
 
     enum FallbackStage {
+        FallbackPriorityFonts,
         FontGroupFonts,
         SegmentedFace,
         PreferencesFonts,
@@ -65,6 +70,7 @@ private:
     FallbackStage m_fallbackStage;
     HashMap<UChar32, RefPtr<SimpleFontData>> m_visitedSystemFonts;
     Vector<FontDataRange> m_loadingCustomFontForRanges;
+    FontFallbackPriority m_fontFallbackPriority;
 };
 
 } // namespace blink