WebFonts: merge fontLoaded() to notifyFinished()

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 80 matching lines @@
 
 FontResource::~FontResource()
 {
 }
 
 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)
         static_cast<FontResourceClient*>(c)->fontLoadLongLimitExceeded(this);
 }
 
 void FontResource::startLoadLimitTimersIfNeeded()
 {
     ASSERT(!stillNeedsLoad());
     if (isLoaded() || m_fontLoadLongLimitTimer.isActive())
@@ skipping 54 matching lines @@
 void FontResource::allClientsAndObserversRemoved()
 {
     m_fontData.clear();
     Resource::allClientsAndObserversRemoved();
 }
 
 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