WebFonts: merge fontLoaded() to notifyFinished()

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..44fae5e86312772783851cd1bb503b59e98fc961 100644
--- a/third_party/WebKit/Source/core/fetch/FontResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/FontResource.cpp
@@ -98,7 +98,7 @@ void FontResource::didAddClient(ResourceClient* c)
     ASSERT(FontResourceClient::isExpectedType(c));
     Resource::didAddClient(c);
     if (isLoaded())
-        static_cast<FontResourceClient*>(c)->fontLoaded(this);
+        c->notifyFinished(this);

[Kunihiko Sakamoto, 2016/04/18 08:18:59]

This is called by above Resource::didAddClient(), isn't it?

[Takashi Toyoshima, 2016/04/18 12:42:03]

Done.

     if (m_loadLimitState == ShortLimitExceeded || m_loadLimitState == LongLimitExceeded)
         static_cast<FontResourceClient*>(c)->fontLoadShortLimitExceeded(this);
     if (m_loadLimitState == LongLimitExceeded)
@@ -173,9 +173,8 @@ void FontResource::checkNotify()
 {
     m_fontLoadShortLimitTimer.stop();
     m_fontLoadLongLimitTimer.stop();
-    ResourceClientWalker<FontResourceClient> w(m_clients);
-    while (FontResourceClient* c = w.next())
-        c->fontLoaded(this);
+
+    Resource::checkNotify();
 }
 
 } // namespace blink