Make text visible when font loading takes longer than 3 seconds

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 27 matching lines @@
 namespace WebCore {
 
 FontFallbackList::FontFallbackList()
     : m_pageZero(0)
     , m_cachedPrimarySimpleFontData(0)
     , m_fontSelector(0)
     , m_fontSelectorVersion(0)
     , m_familyIndex(0)
     , m_generation(FontCache::fontCache()->generation())
     , m_pitch(UnknownPitch)
-    , m_loadingCustomFonts(false)
+    , m_hasLoadingFallback(false)
 {
 }
 
 void FontFallbackList::invalidate(PassRefPtr<FontSelector> fontSelector)
 {
     releaseFontData();
     m_fontList.clear();
     m_pageZero = 0;
     m_pages.clear();
     m_cachedPrimarySimpleFontData = 0;
     m_familyIndex = 0;
     m_pitch = UnknownPitch;
-    m_loadingCustomFonts = false;
+    m_hasLoadingFallback = false;
     m_fontSelector = fontSelector;
     m_fontSelectorVersion = m_fontSelector ? m_fontSelector->version() : 0;
     m_generation = FontCache::fontCache()->generation();
     m_widthCache.clear();
 }
 
 void FontFallbackList::releaseFontData()
 {
     unsigned numFonts = m_fontList.size();
     for (unsigned i = 0; i < numFonts; ++i) {
@@ skipping 14 matching lines @@
         unsigned numRanges = segmentedFontData->numRanges();
         if (numRanges == 1 && segmentedFontData->rangeAt(0).isEntireRange())
             m_pitch = segmentedFontData->rangeAt(0).fontData()->pitch();
         else
             m_pitch = VariablePitch;
     }
 }
 
 bool FontFallbackList::loadingCustomFonts() const
 {
-    if (m_loadingCustomFonts)
-        return true;
+    if (!m_hasLoadingFallback)
+        return false;
 
     unsigned numFonts = m_fontList.size();
     for (unsigned i = 0; i < numFonts; ++i) {
-        if (m_fontList[i]->isCustomFont() && m_fontList[i]->isLoading()) {
-            m_loadingCustomFonts = true;
+        if (m_fontList[i]->isLoading())
             return true;
-        }
     }
     return false;
 }
+
+bool FontFallbackList::shouldSkipDrawing() const
+{
+    if (!m_hasLoadingFallback)
+        return false;
+
+    unsigned numFonts = m_fontList.size();
+    for (unsigned i = 0; i < numFonts; ++i) {
+        if (m_fontList[i]->shouldSkipDrawing())
+            return true;
+    }
+    return false;
+}
 
 const FontData* FontFallbackList::primaryFontData(const FontDescription& fontDescription) const
 {
     bool shouldLoadCustomFont = true;
 
     for (unsigned fontIndex = 0; ; ++fontIndex) {
         const FontData* fontData = fontDataAt(fontDescription, fontIndex);
         if (!fontData) {
             // All fonts are custom fonts and are loading. Return the first FontData.
             // FIXME: Correct fallback to the default font.
@@ skipping 71 matching lines @@
         return 0;
 
     // Ask the font cache for the font data.
     // We are obtaining this font for the first time.  We keep track of the families we've looked at before
     // in |m_familyIndex|, so that we never scan the same spot in the list twice.  getFontData will adjust our
     // |m_familyIndex| as it scans for the right font to make.
     ASSERT(FontCache::fontCache()->generation() == m_generation);
     RefPtr<FontData> result = getFontData(fontDescription, m_familyIndex);
     if (result) {
         m_fontList.append(result);
-        if (result->isLoading())
-            m_loadingCustomFonts = true;
+        if (result->isLoadingFallback())
+            m_hasLoadingFallback = true;
     }
     return result.get();
 }
 
 }