Reland r172943 "Make CSSFontFace::willUseFontData() load fonts with unicode-range"

Source/core/css/CSSFontFace.cpp

 /*
  * Copyright (C) 2007, 2008, 2011 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 108 matching lines @@
         m_sources.removeFirst();
     }
 
     if (loadStatus() == FontFace::Unloaded)
         setLoadStatus(FontFace::Loading);
     if (loadStatus() == FontFace::Loading)
         setLoadStatus(FontFace::Error);
     return nullptr;
 }
 
-void CSSFontFace::willUseFontData(const FontDescription& fontDescription)
+bool CSSFontFace::maybeScheduleFontLoad(const FontDescription& fontDescription, UChar32 character)
 {
-    // Kicks off font load here only if the @font-face has no unicode-range.
-    // @font-faces with unicode-range will be loaded when a GlyphPage for the
-    // font is created.
-    // FIXME: Pass around the text to render from RenderText, and kick download
-    // if m_ranges intersects with the text. Make sure this does not cause
-    // performance regression.
-    if (m_ranges.isEntireRange())
+    if (m_ranges.contains(character)) {
         load(fontDescription);
+        return true;
+    }
+    return false;
 }
 
 void CSSFontFace::load(const FontDescription& fontDescription, CSSFontSelector* fontSelector)
 {
     if (loadStatus() != FontFace::Unloaded)
         return;
     setLoadStatus(FontFace::Loading);
 
     while (!m_sources.isEmpty()) {
         OwnPtr<CSSFontFaceSource>& source = m_sources.first();
@@ skipping 61 matching lines @@
         } else {
             m_ranges[targetIndex++] = UnicodeRange(from, to);
             from = m_ranges[i].from();
             to = m_ranges[i].to();
         }
     }
     m_ranges[targetIndex++] = UnicodeRange(from, to);
     m_ranges.shrink(targetIndex);
 }
 
+bool CSSFontFace::UnicodeRangeSet::contains(UChar32 c) const
+{
+    if (isEntireRange())
+        return true;
+    Vector<UnicodeRange>::const_iterator it = std::lower_bound(m_ranges.begin(), m_ranges.end(), c);
+    return it != m_ranges.end() && it->contains(c);
+}
+
 bool CSSFontFace::UnicodeRangeSet::intersectsWith(const String& text) const
 {
     if (text.isEmpty())
         return false;
     if (isEntireRange())
         return true;
     if (text.is8Bit() && m_ranges[0].from() >= 0x100)
         return false;
 
     unsigned index = 0;
     while (index < text.length()) {
         UChar32 c = text.characterStartingAt(index);
         index += U16_LENGTH(c);
-        Vector<UnicodeRange>::const_iterator it = std::lower_bound(m_ranges.begin(), m_ranges.end(), c);
-        if (it != m_ranges.end() && it->contains(c))
+        if (contains(c))
             return true;
     }
     return false;
 }
 
 void CSSFontFace::trace(Visitor* visitor)
 {
     visitor->trace(m_segmentedFontFace);
     visitor->trace(m_fontFace);
 }
 
 }