[SVG 2/5] Do not reload FontResource created by resourceForStaticData()

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 51d6faab1163d3bce06a2fd7e537647fe4ccc365..b7a1e5d7a3b76bd6342c888902d2b839099ea849 100644
--- a/third_party/WebKit/Source/core/fetch/FontResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/FontResource.cpp
@@ -194,6 +194,13 @@ void FontResource::allClientsRemoved()
 
 void FontResource::checkNotify()
 {
+    // When the FontResource is created by
+    // ResourceFetcher::resourceForStaticData(), checkNotify() is called while
+    // stillNeedsLoad() is true. In this case, we no longer need loading, so we
+    // set |m_state| to |LoadInitiated| and make stillNeedsLoad() false here.
+    if (stillNeedsLoad())
+        m_state = LoadInitiated;
+
     m_fontLoadShortLimitTimer.stop();
     m_fontLoadLongLimitTimer.stop();
     ResourceClientWalker<FontResourceClient> w(m_clients);