Reland: Use FontFallbackPriority Fonts in FontFallbackIterator

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

 /*
  * Copyright (c) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 BlackBerry Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 518 matching lines @@
     const FontDescription& fontDescription = m_font->fontDescription();
     const String& localeString = fontDescription.locale();
     CString locale = localeString.latin1();
     const hb_language_t language = hb_language_from_string(locale.data(), locale.length());
 
     RunSegmenter::RunSegmenterRange segmentRange = {
         0,
         0,
         USCRIPT_INVALID_CODE,
         OrientationIterator::OrientationInvalid,
-        SmallCapsIterator::SmallCapsSameCase };
+        SmallCapsIterator::SmallCapsSameCase,
+        FontFallbackPriority::Invalid };
     RunSegmenter runSegmenter(
         m_normalizedBuffer.get(),
         m_normalizedBufferLength,
         m_font->fontDescription().orientation(),
         fontDescription.variant());
 
     Vector<UChar32> fallbackCharsHint;
 
     // 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);
 
         const SimpleFontData* currentFont = nullptr;
         unsigned currentFontRangeFrom = 0;
         unsigned currentFontRangeTo = 0;
 
         bool fontCycleQueued = false;
         while (m_holesQueue.size()) {
@@ skipping 235 matching lines @@
     }
 
     // Don't need to check m_textRun.allowsTrailingExpansion() since it's covered by !m_expansionOpportunityCount above
     spacing += nextExpansionPerOpportunity();
     m_isAfterExpansion = true;
     return spacing;
 }
 
 
 } // namespace blink