Skip redundant fonts returned by 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 478 matching lines @@
     if (!isVerticalBaseline(runOrientation))
         return originalFont;
 
     if (runOrientation == FontOrientation::VerticalRotated
         || (runOrientation == FontOrientation::VerticalMixed && renderOrientation == OrientationIterator::OrientationRotateSideways))
         return originalFont->verticalRightOrientationFontData().get();
 
     return originalFont;
 }
 
-bool HarfBuzzShaper::collectFallbackHintChars(Vector<UChar32>& hint, bool needsList)
+bool HarfBuzzShaper::collectFallbackHintChars(Vector<UChar32>& hint)
 {
     if (!m_holesQueue.size())
         return false;
 
     hint.clear();
 
     size_t numCharsAdded = 0;
     for (auto it = m_holesQueue.begin(); it != m_holesQueue.end(); ++it) {
         if (it->m_action == HolesQueueNextFont)
             break;
 
         UChar32 hintChar;
         RELEASE_ASSERT(it->m_startIndex + it->m_numCharacters <= m_normalizedBufferLength);
         UTF16TextIterator iterator(m_normalizedBuffer.get() + it->m_startIndex, it->m_numCharacters);
         while (iterator.consume(hintChar)) {
             hint.append(hintChar);
             numCharsAdded++;
-            if (!needsList)
-                break;
             iterator.advance();
         }
     }
     return numCharsAdded > 0;
 }
 
 void HarfBuzzShaper::appendToHolesQueue(HolesQueueItemAction action,
     unsigned startIndex,
     unsigned numCharacters)
 {
@@ skipping 63 matching lines @@
         while (m_holesQueue.size()) {
             HolesQueueItem currentQueueItem = m_holesQueue.takeFirst();
 
             if (currentQueueItem.m_action == HolesQueueNextFont) {
                 // For now, we're building a character list with which we probe
                 // for needed fonts depending on the declared unicode-range of a
                 // segmented CSS font. Alternatively, we can build a fake font
                 // for the shaper and check whether any glyphs were found, or
                 // define a new API on the shaper which will give us coverage
                 // information?
-                if (!collectFallbackHintChars(fallbackCharsHint, fallbackIterator->needsHintList())) {
+                if (!collectFallbackHintChars(fallbackCharsHint)) {
                     // Give up shaping since we cannot retrieve a font fallback
                     // font without a hintlist.
                     m_holesQueue.clear();
                     break;
                 }
 
                 currentFontDataForRangeSet = fallbackIterator->next(fallbackCharsHint);
 
                 if (!currentFontDataForRangeSet->fontData()) {
                     ASSERT(!m_holesQueue.size());
@@ skipping 89 matching lines @@
     result->m_width = run->m_width;
     result->m_numGlyphs = count;
     ASSERT(result->m_numGlyphs == count); // no overflow
     result->m_hasVerticalOffsets = fontData->platformData().isVerticalAnyUpright();
     result->m_runs.append(std::move(run));
     return result.release();
 }
 
 
 } // namespace blink