Move @font-face logic from ScopedStyleResolver to StyleEngine.

sky/engine/core/dom/StyleEngine.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 12 matching lines @@
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "sky/engine/config.h"
 #include "sky/engine/core/dom/StyleEngine.h"
 
 #include "sky/engine/core/css/CSSFontSelector.h"
 #include "sky/engine/core/css/CSSStyleSheet.h"
+#include "sky/engine/core/css/FontFace.h"
 #include "sky/engine/core/css/FontFaceCache.h"
 #include "sky/engine/core/css/StyleSheetContents.h"
 #include "sky/engine/core/dom/Document.h"
 #include "sky/engine/core/dom/Element.h"
 #include "sky/engine/core/dom/ElementTraversal.h"
 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
 #include "sky/engine/core/frame/Settings.h"
 #include "sky/engine/core/html/HTMLStyleElement.h"
 #include "sky/engine/core/html/imports/HTMLImportsController.h"
 #include "sky/engine/core/page/Page.h"
@@ skipping 31 matching lines @@
     ASSERT(!m_document->inStyleRecalc());
     ASSERT(m_resolver);
 
     StyleResolver& resolver = m_document->ensureStyleResolver();
 
     resolver.resetMediaQueryAffectedByViewportChange();
 
     for (TreeScope* treeScope : m_activeTreeScopes)
         treeScope->scopedStyleResolver().updateActiveStyleSheets();
 
-    m_document->renderView()->style()->font().update(fontSelector());
+    updateDocumentFonts();
 }
 
 void StyleEngine::resolverChanged()
 {
     if (!m_document->isActive())
         return;
     updateActiveStyleSheets();
 }
 
+void StyleEngine::updateDocumentFonts()
+{
+    // TODO(esprehn): We should really support @font-face in ShadowRoot too.
+
+    const auto& sheets = m_document->scopedStyleResolver().authorStyleSheets();
+
+    for (const auto& sheet : sheets) {
+        RuleSet& ruleSet = sheet->contents()->ruleSet();
+        for (const auto& rule : ruleSet.fontFaceRules()) {
+            if (RefPtr<FontFace> fontFace = FontFace::create(m_document, rule))
+                m_fontSelector->fontFaceCache()->add(m_fontSelector.get(), rule, fontFace);
+        }
+        if (!ruleSet.fontFaceRules().isEmpty())
+            m_resolver->invalidateMatchedPropertiesCache();
+    }
+
+    m_document->renderView()->style()->font().update(m_fontSelector.get());
+}
+
 void StyleEngine::clearFontCache()
 {
     m_fontSelector->fontFaceCache()->clearCSSConnected();
     m_resolver->invalidateMatchedPropertiesCache();
 }
 
 void StyleEngine::updateGenericFontFamilySettings()
 {
     // FIXME: we should not update generic font family settings when
     // document is inactive.
@@ skipping 36 matching lines @@
     m_sheetToTextCache.remove(contents);
 }
 
 void StyleEngine::fontsNeedUpdate(CSSFontSelector*)
 {
     m_resolver->invalidateMatchedPropertiesCache();
     m_document->setNeedsStyleRecalc(SubtreeStyleChange);
 }
 
 }