Revert of Shape unicode-range: font faces in only one iteration

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 2185e71081e41e80c83f89224b64c0b2e676a7d2..643b805fc9599264e6cdee5bedb8026ff396c88d 100644
--- a/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
+++ b/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
@@ -5,7 +5,7 @@
 #ifndef FontFallbackIterator_h
 #define FontFallbackIterator_h
 
-#include "platform/fonts/FontDataForRangeSet.h"
+#include "platform/fonts/FontDataRange.h"
 #include "platform/fonts/FontFallbackPriority.h"
 #include "wtf/HashMap.h"
 #include "wtf/PassRefPtr.h"
@@ -21,6 +21,7 @@
 class FontDescription;
 class FontFallbackList;
 class SimpleFontData;
+struct FontDataRange;
 class FontFamily;
 
 class FontFallbackIterator : public RefCounted<FontFallbackIterator> {
@@ -40,14 +41,14 @@
     // Some system fallback APIs (Windows, Android) require a character, or a
     // portion of the string to be passed.  On Mac and Linux, we get a list of
     // fonts without passing in characters.
-    const FontDataForRangeSet next(const Vector<UChar32>& hintList);
+    const FontDataRange next(const Vector<UChar32>& hintList);
 
 private:
     FontFallbackIterator(const FontDescription&, PassRefPtr<FontFallbackList>,
         FontFallbackPriority);
-    bool rangeSetContributesForHint(const Vector<UChar32> hintList, const FontDataForRangeSet&);
+    bool rangeContributesForHint(const Vector<UChar32> hintList, const FontDataRange&);
     bool alreadyLoadingRangeForHintChar(UChar32 hintChar);
-    void willUseRange(const AtomicString& family, const FontDataForRangeSet&);
+    void willUseRange(const AtomicString& family, const FontDataRange&);
 
     const PassRefPtr<SimpleFontData> fallbackPriorityFont(UChar32 hint);
     const PassRefPtr<SimpleFontData> uniqueSystemFontForHint(UChar32 hint);
@@ -55,7 +56,7 @@
     const FontDescription& m_fontDescription;
     RefPtr<FontFallbackList> m_fontFallbackList;
     int m_currentFontDataIndex;
-    unsigned m_segmentedFaceIndex;
+    unsigned m_segmentedIndex;
 
     enum FallbackStage {
         FallbackPriorityFonts,
@@ -68,7 +69,7 @@
 
     FallbackStage m_fallbackStage;
     HashMap<UChar32, RefPtr<SimpleFontData>> m_visitedSystemFonts;
-    Vector<FontDataForRangeSet> m_trackedLoadingRangeSets;
+    Vector<FontDataRange> m_loadingCustomFontForRanges;
     FontFallbackPriority m_fontFallbackPriority;
 };