Use unicode-range to prevent unnecessary @font-face donwnloads

Source/core/css/CSSSegmentedFontFace.cpp

 /*
  * Copyright (C) 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 74 matching lines @@
     }
 }
 
 void CSSSegmentedFontFace::appendFontFace(PassRefPtr<CSSFontFace> fontFace)
 {
     pruneTable();
     fontFace->setSegmentedFontFace(this);
     m_fontFaces.append(fontFace);
 }
 
-static void appendFontDataWithInvalidUnicodeRangeIfLoading(SegmentedFontData* newFontData, PassRefPtr<SimpleFontData> prpFaceFontData, const Vector<CSSFontFace::UnicodeRange>& ranges)
+static void appendFontData(SegmentedFontData* newFontData, PassRefPtr<SimpleFontData> prpFaceFontData, const Vector<CSSFontFace::UnicodeRange>& ranges)
 {
     RefPtr<SimpleFontData> faceFontData = prpFaceFontData;
-    if (faceFontData->isLoading()) {
-        newFontData->appendRange(FontDataRange(0, 0, faceFontData));
-        return;
-    }
-
     unsigned numRanges = ranges.size();
     if (!numRanges) {
         newFontData->appendRange(FontDataRange(0, 0x7FFFFFFF, faceFontData));
         return;
     }
 
     for (unsigned j = 0; j < numRanges; ++j)
         newFontData->appendRange(FontDataRange(ranges[j].from(), ranges[j].to(), faceFontData));
 }
 
@@ skipping 16 matching lines @@
         fontData = SegmentedFontData::create();
 
     bool syntheticBold = !(m_traitsMask & (FontWeight600Mask | FontWeight700Mask | FontWeight800Mask | FontWeight900Mask)) && (desiredTraitsMask & (FontWeight600Mask | FontWeight700Mask | FontWeight800Mask | FontWeight900Mask));
     bool syntheticItalic = !(m_traitsMask & FontStyleItalicMask) && (desiredTraitsMask & FontStyleItalicMask);
 
     for (int i = m_fontFaces.size() - 1; i >= 0; --i) {
         if (!m_fontFaces[i]->isValid())
             continue;
         if (RefPtr<SimpleFontData> faceFontData = m_fontFaces[i]->getFontData(fontDescription, syntheticBold, syntheticItalic)) {
             ASSERT(!faceFontData->isSegmented());
-            appendFontDataWithInvalidUnicodeRangeIfLoading(fontData.get(), faceFontData.release(), m_fontFaces[i]->ranges());
+            appendFontData(fontData.get(), faceFontData.release(), m_fontFaces[i]->ranges());
         }
     }
     if (fontData->numRanges())
         return fontData; // No release, we have a reference to an object in the cache which should retain the ref count it has.
 
     return 0;
 }
 
 bool CSSSegmentedFontFace::hasSVGFontFaceSource() const
 {
@@ skipping 27 matching lines @@
     unsigned size = m_fontFaces.size();
     for (unsigned i = 0; i < size; i++) {
         if (m_fontFaces[i]->loadStatus() != FontFace::Loaded)
             return false;
     }
     return true;
 }
 
 void CSSSegmentedFontFace::loadFont(const FontDescription& fontDescription, PassRefPtr<LoadFontCallback> callback)
 {
-    getFontData(fontDescription); // Kick off the load.
+    RefPtr<SegmentedFontData> fontData = toSegmentedFontData(getFontData(fontDescription).get());
+    unsigned numRanges = fontData->numRanges();
+    for (unsigned i = 0; i < numRanges; i++)
+        fontData->rangeAt(i).fontData()->beginLoadIfNeeded();
 
     if (callback) {
         if (isLoading())
             m_callbacks.append(callback);
         else if (checkFont())
             callback->notifyLoaded(this);
         else
             callback->notifyError(this);
     }
 }
 
 }