Notify font loads via FontLoader

Source/core/css/FontLoader.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/FontLoader.h"
 
+#include "core/css/CSSFontSelector.h"
 #include "core/fetch/FontResource.h"
 #include "core/fetch/ResourceFetcher.h"
 
 namespace WebCore {
 
-FontLoader::FontLoader(ResourceFetcher* resourceFetcher)
+FontLoader::FontLoader(CSSFontSelector* fontSelector, ResourceFetcher* resourceFetcher)
     : m_beginLoadingTimer(this, &FontLoader::beginLoadTimerFired)
+    , m_fontSelector(fontSelector)
     , m_resourceFetcher(resourceFetcher)
 {
 }
 
 FontLoader::~FontLoader()
 {
 #if ENABLE(OILPAN)
     if (!m_resourceFetcher) {
         ASSERT(m_fontsToBeginLoading.isEmpty());
         return;
@@ skipping 31 matching lines @@
     for (FontsToLoadVector::iterator it = fontsToBeginLoading.begin(); it != fontsToBeginLoading.end(); ++it) {
         FontResource* fontResource = it->first.get();
         fontResource->beginLoadIfNeeded(m_resourceFetcher);
     }
 
     // When the local fontsToBeginLoading vector goes out of scope it will
     // decrement the request counts on the ResourceFetcher for all the fonts
     // that were just loaded.
 }
 
+void FontLoader::fontFaceInvalidated()
+{
+    if (m_fontSelector)
+        m_fontSelector->fontFaceInvalidated();
+}
+
 #if !ENABLE(OILPAN)
 void FontLoader::clearResourceFetcher()

[bashi, 2014/06/18 07:27:45]

nit: we might want to rename this method.

[Kunihiko Sakamoto, 2014/06/18 08:21:25]

Renamed to clearResourceFetcherAndFontSelector (couldn't come up with a good
name...).

 {
     if (!m_resourceFetcher) {
         ASSERT(m_fontsToBeginLoading.isEmpty());
         return;
     }
 
     m_beginLoadingTimer.stop();
     m_fontsToBeginLoading.clear();
     m_resourceFetcher = nullptr;
+    m_fontSelector = nullptr;
 }
 #endif
 
 void FontLoader::trace(Visitor* visitor)
 {
     visitor->trace(m_resourceFetcher);
+    visitor->trace(m_fontSelector);
 }
 
 } // namespace WebCore