Make text visible when font loading takes longer than 3 seconds

Source/core/fetch/FontResource.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  *
  * 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 26 matching lines @@
 
 #if ENABLE(SVG_FONTS)
 #include "SVGNames.h"
 #include "core/html/HTMLCollection.h"
 #include "core/svg/SVGDocument.h"
 #include "core/svg/SVGFontElement.h"
 #endif
 
 namespace WebCore {
 
+static const double fontLoadWaitLimitSec = 3.0;
+
 FontResource::FontResource(const ResourceRequest& resourceRequest)
     : Resource(resourceRequest, Font)
     , m_loadInitiated(false)
+    , m_exceedsFontLoadWaitLimit(false)
+    , m_fontLoadWaitLimitTimer(this, &FontResource::fontLoadWaitLimitCallback)
 {
 }
 
 FontResource::~FontResource()
 {
 }
 
 void FontResource::load(ResourceFetcher*, const ResourceLoaderOptions& options)
 {
     // Don't load the file yet. Wait for an access before triggering the load.
     setLoading(true);
     m_options = options;
 }
 
 void FontResource::didAddClient(ResourceClient* c)
 {
     ASSERT(c->resourceClientType() == FontResourceClient::expectedType());
     Resource::didAddClient(c);
     if (!isLoading())
         static_cast<FontResourceClient*>(c)->fontLoaded(this);
 }
 
 void FontResource::beginLoadIfNeeded(ResourceFetcher* dl)
 {
     if (!m_loadInitiated) {
         m_loadInitiated = true;
         Resource::load(dl, m_options);
+        m_fontLoadWaitLimitTimer.startOneShot(fontLoadWaitLimitSec);
 
         ResourceClientWalker<FontResourceClient> walker(m_clients);
         while (FontResourceClient* client = walker.next())
             client->didStartFontLoad(this);
     }
 }
 
 bool FontResource::ensureCustomFontData()
 {
     if (!m_fontData && !errorOccurred() && !isLoading()) {
@@ skipping 61 matching lines @@
     for (unsigned i = 0; i < collectionLength; ++i) {
         SVGFontElement* element = toSVGFontElement(collection->item(i));
         if (element->getIdAttribute() == fontName)
             return element;
     }
 
     return 0;
 }
 #endif
 
+void FontResource::fontLoadWaitLimitCallback(Timer<FontResource>*)
+{
+    if (!isLoading())
+        return;
+    m_exceedsFontLoadWaitLimit = true;
+    ResourceClientWalker<FontResourceClient> walker(m_clients);
+    while (FontResourceClient* client = walker.next())
+        client->fontLoadWaitLimitExceeded(this);
+}
+
 void FontResource::allClientsRemoved()
 {
     m_fontData.clear();
     Resource::allClientsRemoved();
 }
 
 void FontResource::checkNotify()
 {
+    m_fontLoadWaitLimitTimer.stop();
     ResourceClientWalker<FontResourceClient> w(m_clients);
     while (FontResourceClient* c = w.next())
         c->fontLoaded(this);
 }
 
 }