Revert of Use FontFallbackPriority Fonts in FontFallbackIterator

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

Index: third_party/WebKit/Source/platform/fonts/FontFallbackIterator.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.cpp b/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.cpp
index 0b73e27a1ecf6b965bceb88178c68c4a6ca35fea..f13d587b3a6cf07ad0162214af6a87caf8922936 100644
--- a/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.cpp
+++ b/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.cpp
@@ -13,24 +13,17 @@
 
 namespace blink {
 
-PassRefPtr<FontFallbackIterator> FontFallbackIterator::create(
-    const FontDescription& description,
-    PassRefPtr<FontFallbackList> fallbackList,
-    FontFallbackPriority fontFallbackPriority)
+PassRefPtr<FontFallbackIterator> FontFallbackIterator::create(const FontDescription& description, PassRefPtr<FontFallbackList> fallbackList)
 {
-    return adoptRef(new FontFallbackIterator(
-        description, fallbackList, fontFallbackPriority));
+    return adoptRef(new FontFallbackIterator(description, fallbackList));
 }
 
-FontFallbackIterator::FontFallbackIterator(const FontDescription& description,
-    PassRefPtr<FontFallbackList> fallbackList,
-    FontFallbackPriority fontFallbackPriority)
+FontFallbackIterator::FontFallbackIterator(const FontDescription& description, PassRefPtr<FontFallbackList> fallbackList)
     : m_fontDescription(description)
     , m_fontFallbackList(fallbackList)
     , m_currentFontDataIndex(0)
     , m_segmentedIndex(0)
     , m_fallbackStage(FontGroupFonts)
-    , m_fontFallbackPriority(fontFallbackPriority)
 {
 }
 
@@ -78,17 +71,12 @@
     if (m_fallbackStage == OutOfLuck)
         return FontDataRange();
 
-    if (m_fallbackStage == FallbackPriorityFonts) {
-        // Only try one fallback priority font,
-        // then proceed to regular system fallback.
+    const FontData* fontData = m_fontFallbackList->fontDataAt(m_fontDescription, m_currentFontDataIndex);
+
+    // If there is no fontData coming from the fallback list, it means
+    // we have reached the system fallback stage.
+    if (!fontData) {
         m_fallbackStage = SystemFonts;
-        FontDataRange fallbackPriorityFontRange(fallbackPriorityFont(hintList[0]));
-        if (fallbackPriorityFontRange.hasFontData())
-            return fallbackPriorityFontRange;
-        return next(hintList);
-    }
-
-    if (m_fallbackStage == SystemFonts) {
         // We've reached pref + system fallback.
         ASSERT(hintList.size());
         RefPtr<SimpleFontData> systemFont = uniqueSystemFontForHint(hintList[0]);
@@ -105,21 +93,6 @@
         RefPtr<SimpleFontData> lastResort = fontCache->getLastResortFallbackFont(m_fontDescription).get();
         RELEASE_ASSERT(lastResort);
         return FontDataRange(lastResort);
-    }
-
-    ASSERT(m_fallbackStage == FontGroupFonts
-        || m_fallbackStage == SegmentedFace);
-    const FontData* fontData = m_fontFallbackList->fontDataAt(
-        m_fontDescription, m_currentFontDataIndex);
-
-    if (!fontData) {
-        // If there is no fontData coming from the fallback list, it means
-        // we are now looking at system fonts, either for prioritized symbol
-        // or emoji fonts or by calling system fallback API.
-        m_fallbackStage = isNonTextFallbackPriority(m_fontFallbackPriority)
-            ? FallbackPriorityFonts
-            : SystemFonts;
-        return next(hintList);
     }
 
     // Otherwise we've received a fontData from the font-family: set of fonts,
@@ -164,16 +137,6 @@
     return next(hintList);
 }
 
-const PassRefPtr<SimpleFontData> FontFallbackIterator::fallbackPriorityFont(
-    UChar32 hint)
-{
-    return FontCache::fontCache()->fallbackFontForCharacter(
-        m_fontDescription,
-        hint,
-        m_fontFallbackList->primarySimpleFontData(m_fontDescription),
-        m_fontFallbackPriority);
-}
-
 const PassRefPtr<SimpleFontData> FontFallbackIterator::uniqueSystemFontForHint(UChar32 hint)
 {
     FontCache* fontCache = FontCache::fontCache();