[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..57e228dd97a6c6f8489302c9241173f3f49f4e65 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 checkNotify() is called while stillNeedsLoad() is true, for
+    // example when the FontResource is created by

[Nate Chapin, 2016/03/01 19:17:28]

"for example" doesn't seem right here, as this should be the only case where
this is true.

[hiroshige, 2016/03/01 22:11:51]

Done.

+    // ResourceFetcher::preCacheData(), we no longer need loading, so we set

[Nate Chapin, 2016/03/01 19:17:28]

Update preCacheData() to the new name.

[hiroshige, 2016/03/01 22:11:51]

Done.

+    // |m_state| to |LoadInitiated| and make stillNeedsLoad() false here.
+    if (stillNeedsLoad())
+        m_state = LoadInitiated;

[Nate Chapin, 2016/03/01 19:17:28]

Doing this work here is kind of hacky. Is there anywhere else we can do it?
Should we at least note that this is kind of hacky? :)

[hiroshige, 2016/03/01 22:11:52]

Not sure > anywhere else.
ksakamoto@, do you have any thoughts?

+
     m_fontLoadShortLimitTimer.stop();
     m_fontLoadLongLimitTimer.stop();
     ResourceClientWalker<FontResourceClient> w(m_clients);