Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(801)

Unified Diff: third_party/WebKit/Source/core/fetch/FontResource.cpp

Issue 1894953002: WebFonts: merge fontLoaded() to notifyFinished() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address review #6 Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..6c2d95a3414615a16eb31447b9fb735d6a971b3c 100644
--- a/third_party/WebKit/Source/core/fetch/FontResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/FontResource.cpp
@@ -97,8 +97,6 @@ void FontResource::didAddClient(ResourceClient* c)
{
ASSERT(FontResourceClient::isExpectedType(c));
Resource::didAddClient(c);
- if (isLoaded())
- static_cast<FontResourceClient*>(c)->fontLoaded(this);
if (m_loadLimitState == ShortLimitExceeded || m_loadLimitState == LongLimitExceeded)
static_cast<FontResourceClient*>(c)->fontLoadShortLimitExceeded(this);
if (m_loadLimitState == LongLimitExceeded)
@@ -173,9 +171,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

Powered by Google App Engine
This is Rietveld 408576698