Prevent FontResource load limit timers from restarting during loading

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 65 matching lines @@
             WebURLRequest::FrameTypeNone);
   request.mutableResourceRequest().setRequestContext(
       WebURLRequest::RequestContextFont);
   return toFontResource(
       fetcher->requestResource(request, FontResourceFactory()));
 }
 
 FontResource::FontResource(const ResourceRequest& resourceRequest,
                            const ResourceLoaderOptions& options)
     : Resource(resourceRequest, Font, options),
-      m_loadLimitState(UnderLimit),
+      m_loadLimitState(LoadNotStarted),
       m_corsFailed(false),
       m_fontLoadShortLimitTimer(this,
                                 &FontResource::fontLoadShortLimitCallback),
       m_fontLoadLongLimitTimer(this, &FontResource::fontLoadLongLimitCallback) {
 }
 
 FontResource::~FontResource() {}
 
 void FontResource::didAddClient(ResourceClient* c) {
   DCHECK(FontResourceClient::isExpectedType(c));
   Resource::didAddClient(c);
   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;
+  m_loadLimitState = LoadNotStarted;
   Resource::setRevalidatingRequest(request);
 }
 
-void FontResource::startLoadLimitTimersIfNeeded() {
-  DCHECK(!stillNeedsLoad());
-  if (isLoaded() || m_fontLoadLongLimitTimer.isActive())
-    return;
-  DCHECK_EQ(m_loadLimitState, UnderLimit);
+void FontResource::startLoadLimitTimers() {
+  DCHECK(isLoading());
+  DCHECK_EQ(m_loadLimitState, LoadNotStarted);
+  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 (data())
       m_fontData = FontCustomPlatformData::create(data(), m_otsParsingMessage);
@@ skipping 43 matching lines @@
 }
 
 void FontResource::checkNotify() {
   m_fontLoadShortLimitTimer.stop();
   m_fontLoadLongLimitTimer.stop();
 
   Resource::checkNotify();
 }
 
 }  // namespace blink