Shape unicode-range: font faces in only one iteration

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 115 matching lines @@
         const SimpleFontData* fontDataForSpace = fontData->fontDataForCharacter(spaceCharacter);
         ASSERT(fontDataForSpace);
 
         // When a custom font is loading, we should use the correct fallback font to layout the text.
         // Here skip the temporary font for the loading custom font which may not act as the correct fallback font.
         if (!fontDataForSpace->isLoadingFallback())
             return fontDataForSpace;
 
         if (fontData->isSegmented()) {
             const SegmentedFontData* segmented = toSegmentedFontData(fontData);
-            for (unsigned i = 0; i < segmented->numRanges(); i++) {
-                const SimpleFontData* rangeFontData = segmented->rangeAt(i).fontData().get();
+            for (unsigned i = 0; i < segmented->numFaces(); i++) {
+                const SimpleFontData* rangeFontData = segmented->faceAt(i).fontData().get();
                 if (!rangeFontData->isLoadingFallback())
                     return rangeFontData;
             }
             if (fontData->isLoading())
                 shouldLoadCustomFont = false;
         }
 
         // Begin to load the first custom font if needed.
         if (shouldLoadCustomFont) {
             shouldLoadCustomFont = false;
@@ skipping 83 matching lines @@
 
 bool FontFallbackList::isValid() const
 {
     if (!m_fontSelector)
         return m_fontSelectorVersion == 0;
 
     return m_fontSelector->version() == m_fontSelectorVersion;
 }
 
 } // namespace blink