Reland: Use FontFallbackPriority Fonts in FontFallbackIterator

third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp

Index: third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
index 1f610442e66dd696b152f475c795a3606256e8ac..71e9cd534e283a0c50cfaab1f22011b820d36206 100644
--- a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
+++ b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
@@ -536,7 +536,8 @@ PassRefPtr<ShapeResult> HarfBuzzShaper::shapeResult()
         0,
         USCRIPT_INVALID_CODE,
         OrientationIterator::OrientationInvalid,
-        SmallCapsIterator::SmallCapsSameCase };
+        SmallCapsIterator::SmallCapsSameCase,
+        FontFallbackPriority::Invalid };
     RunSegmenter runSegmenter(
         m_normalizedBuffer.get(),
         m_normalizedBufferLength,
@@ -548,7 +549,9 @@ PassRefPtr<ShapeResult> HarfBuzzShaper::shapeResult()
     // TODO: Check whether this treatAsZerowidthspace from the previous script
     // segmentation plays a role here, does the new scriptRuniterator handle that correctly?
     while (runSegmenter.consume(&segmentRange)) {
-        RefPtr<FontFallbackIterator> fallbackIterator = m_font->createFontFallbackIterator();
+        RefPtr<FontFallbackIterator> fallbackIterator =
+            m_font->createFontFallbackIterator(
+            segmentRange.fontFallbackPriority);
 
         appendToHolesQueue(HolesQueueNextFont, 0, 0);
         appendToHolesQueue(HolesQueueRange, segmentRange.start, segmentRange.end - segmentRange.start);