WebFonts: reset m_loadLimitState on memory cache revalidation

third_party/WebKit/Source/core/fetch/FontResource.cpp

Index: third_party/WebKit/Source/core/fetch/FontResource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/FontResource.cpp b/third_party/WebKit/Source/core/fetch/FontResource.cpp
index eb9da1f40a8a0eea29d37d227d7b2bd35de1e74c..2ca8b83f8b8874a6b41eabb4538d28791ca08ddb 100644
--- a/third_party/WebKit/Source/core/fetch/FontResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/FontResource.cpp
@@ -105,11 +105,20 @@ void FontResource::didAddClient(ResourceClient* c)
         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);
 }