WebFonts: reset m_loadLimitState on memory cache revalidation

third_party/WebKit/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 87 matching lines @@
     ASSERT(FontResourceClient::isExpectedType(c));
     Resource::didAddClient(c);
     if (isLoaded())
         static_cast<FontResourceClient*>(c)->fontLoaded(this);
     if (m_loadLimitState == ShortLimitExceeded || m_loadLimitState == LongLimitExceeded)
         static_cast<FontResourceClient*>(c)->fontLoadShortLimitExceeded(this);
     if (m_loadLimitState == LongLimitExceeded)
         static_cast<FontResourceClient*>(c)->fontLoadLongLimitExceeded(this);
 }
 
+void FontResource::setRevalidatingRequest(const ResourceRequest& request)
+{
+    // Reload will use the same object, and needs to reset |m_loadLimitState|
+    // before any didAddClient() is called again.
+    m_loadLimitState = UnderLimit;
+    Resource::setRevalidatingRequest(request);
+}
+
 void FontResource::startLoadLimitTimersIfNeeded()
 {
     ASSERT(!stillNeedsLoad());
     if (isLoaded() || m_fontLoadLongLimitTimer.isActive())
         return;
+    ASSERT(m_loadLimitState == UnderLimit);
     m_fontLoadShortLimitTimer.startOneShot(fontLoadWaitShortLimitSec, BLINK_FROM_HERE);
     m_fontLoadLongLimitTimer.startOneShot(fontLoadWaitLongLimitSec, BLINK_FROM_HERE);
 }
 
 bool FontResource::ensureCustomFontData()
 {
     if (!m_fontData && !errorOccurred() && !isLoading()) {
         if (m_data)
             m_fontData = FontCustomPlatformData::create(m_data.get(), m_otsParsingMessage);
 
@@ skipping 49 matching lines @@
 void FontResource::checkNotify()
 {
     m_fontLoadShortLimitTimer.stop();
     m_fontLoadLongLimitTimer.stop();
     ResourceClientWalker<FontResourceClient> w(m_clients);
     while (FontResourceClient* c = w.next())
         c->fontLoaded(this);
 }
 
 } // namespace blink