Revert of Shape unicode-range: font faces in only one iteration

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

 /*
  * Copyright (C) 2006, 2007, 2008 Apple 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 227 matching lines @@
     // for only 128 out of 256 characters.
     bool haveGlyphs;
     if (!fontData->isSegmented()) {
         m_page = GlyphPage::createForSingleFontData(this, toSimpleFontData(fontData));
         haveGlyphs = fill(m_page.get(), 0, GlyphPage::size, buffer, bufferLength, toSimpleFontData(fontData));
     } else {
         m_page = GlyphPage::createForMixedFontData(this);
         haveGlyphs = false;
 
         const SegmentedFontData* segmentedFontData = toSegmentedFontData(fontData);
-        for (int i = segmentedFontData->numFaces() - 1; i >= 0; i--) {
-            const FontDataForRangeSet& fontDataForRangeSet = segmentedFontData->faceAt(i);
-            RefPtr<UnicodeRangeSet> ranges = fontDataForRangeSet.ranges();
-            for (size_t i = 0; i < ranges->size(); ++i) {
-                const UnicodeRange& range = ranges->rangeAt(i);
-                // all this casting is to ensure all the parameters to min and max have the same type,
-                // to avoid ambiguous template parameter errors on Windows
-                int from = max(0, static_cast<int>(range.from()) - static_cast<int>(start));
-                int to = 1 + min(static_cast<int>(range.to()) - static_cast<int>(start), static_cast<int>(GlyphPage::size) - 1);
-                if (from >= static_cast<int>(GlyphPage::size) || to <= 0)
-                    continue;
+        for (int i = segmentedFontData->numRanges() - 1; i >= 0; i--) {
+            const FontDataRange& range = segmentedFontData->rangeAt(i);
+            // all this casting is to ensure all the parameters to min and max have the same type,
+            // to avoid ambiguous template parameter errors on Windows
+            int from = max(0, static_cast<int>(range.from()) - static_cast<int>(start));
+            int to = 1 + min(static_cast<int>(range.to()) - static_cast<int>(start), static_cast<int>(GlyphPage::size) - 1);
+            if (from >= static_cast<int>(GlyphPage::size) || to <= 0)
+                continue;
 
-                // If this is a custom font needs to be loaded, do not fill
-                // the page so that font fallback is used while loading.
-                RefPtr<CustomFontData> customData = fontDataForRangeSet.fontData()->customFontData();
-                if (customData && customData->isLoadingFallback()) {
-                    for (int j = from; j < to; j++) {
-                        m_page->setCustomFontToLoad(j, customData.get());
-                        haveGlyphs = true;
-                    }
-                    continue;
+            // If this is a custom font needs to be loaded, do not fill
+            // the page so that font fallback is used while loading.
+            RefPtr<CustomFontData> customData = range.fontData()->customFontData();
+            if (customData && customData->isLoadingFallback()) {
+                for (int j = from; j < to; j++) {
+                    m_page->setCustomFontToLoad(j, customData.get());
+                    haveGlyphs = true;
                 }
+                continue;
+            }
 
-                haveGlyphs |= fill(m_page.get(), from, to - from, buffer + from * (start < 0x10000 ? 1 : 2), (to - from) * (start < 0x10000 ? 1 : 2), fontDataForRangeSet.fontData().get());
-            }
+            haveGlyphs |= fill(m_page.get(), from, to - from, buffer + from * (start < 0x10000 ? 1 : 2), (to - from) * (start < 0x10000 ? 1 : 2), range.fontData().get());
         }
     }
 
     if (!haveGlyphs)
         m_page = nullptr;
 }
 
 void GlyphPageTreeNode::initializeOverridePage(const FontData* fontData, unsigned pageNumber)
 {
     GlyphPage* parentPage = m_parent->page();
@@ skipping 158 matching lines @@
     // entries may use different fonts depending on character. If the Font
     // ever finds it needs a glyph out of the system fallback page, it will
     // ask the system for the best font to use and fill that glyph in for us.
     if (GlyphPage* parentPage = m_parent->page())
         return parentPage->createCopiedSystemFallbackPage(this);
     return GlyphPage::createForMixedFontData(this);
 }
 
 } // namespace blink