Simplify GlyphPage initialization for SegmentedFontData

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 196 matching lines @@
             // for only 128 out of 256 characters.
             bool haveGlyphs;
             if (!fontData->isSegmented()) {
                 m_page = GlyphPage::createForSingleFontData(this, static_cast<const SimpleFontData*>(fontData));
                 haveGlyphs = fill(m_page.get(), 0, GlyphPage::size, buffer, bufferLength, static_cast<const SimpleFontData*>(fontData));
             } else {
                 m_page = GlyphPage::createForMixedFontData(this);
                 haveGlyphs = false;
 
                 const SegmentedFontData* segmentedFontData = static_cast<const SegmentedFontData*>(fontData);
-                unsigned numRanges = segmentedFontData->numRanges();
-                bool zeroFilled = false;
-                RefPtr<GlyphPage> scratchPage;
-                GlyphPage* pageToFill = m_page.get();
-                for (unsigned i = 0; i < numRanges; i++) {
+                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) {
-                        // If this is a custom font needs to be loaded, kick off
-                        // the load here, and do not fill the page so that
-                        // font fallback is used while loading.
-                        RefPtr<CustomFontData> customData = range.fontData()->customFontData();
-                        if (customData && customData->isLoadingFallback()) {
-                            customData->beginLoadIfNeeded();
-                            continue;
-                        }
+                    if (from >= static_cast<int>(GlyphPage::size) || to <= 0)
+                        continue;
 
-                        if (haveGlyphs && !scratchPage) {
-                            scratchPage = GlyphPage::createForMixedFontData(this);
-                            pageToFill = scratchPage.get();
-                        }
+                    // If this is a custom font needs to be loaded, kick off
+                    // the load here, and do not fill the page so that
+                    // font fallback is used while loading.
+                    RefPtr<CustomFontData> customData = range.fontData()->customFontData();
+                    if (customData && customData->isLoadingFallback()) {
+                        customData->beginLoadIfNeeded();
+                        continue;
+                    }
 
-                        if (!zeroFilled) {
-                            if (from > 0 || to < static_cast<int>(GlyphPage::size)) {
-                                for (unsigned i = 0; i < GlyphPage::size; i++)
-                                    pageToFill->setGlyphDataForIndex(i, 0, 0);
-                            }
-                            zeroFilled = true;
-                        }
-                        haveGlyphs |= fill(pageToFill, from, to - from, buffer + from * (start < 0x10000 ? 1 : 2), (to - from) * (start < 0x10000 ? 1 : 2), range.fontData().get());
-                        if (scratchPage) {
-                            ASSERT_WITH_SECURITY_IMPLICATION(to <=  static_cast<int>(GlyphPage::size));
-                            for (int j = from; j < to; j++) {
-                                if (!m_page->glyphAt(j) && pageToFill->glyphAt(j))
-                                    m_page->setGlyphDataForIndex(j, pageToFill->glyphDataForIndex(j));
-                            }
-                        }
-                    }
+                    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;
         } else if (parentPage && parentPage->owner() != m_parent) {
             // The page we're overriding may not be owned by our parent node.
             // This happens when our parent node provides no useful overrides
             // and just copies the pointer to an already-existing page (see
             // below).
@@ skipping 160 matching lines @@
         printf("\nPage %d:\n", it->key);
         showGlyphPageTree(it->key);
     }
 }
 
 void showGlyphPageTree(unsigned pageNumber)
 {
     WebCore::GlyphPageTreeNode::getRoot(pageNumber)->showSubtree();
 }
 #endif