Remove tracking of pending sheets.

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 23 matching lines @@
 #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/StyleSheetCollection.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"
+#include "sky/engine/core/rendering/RenderView.h"
 
 namespace blink {
 
 StyleEngine::StyleEngine(Document& document)
     : m_document(&document)
+    , m_resolver(adoptPtr(new StyleResolver(*m_document)))
     , m_fontSelector(CSSFontSelector::create(&document))
 {
     m_fontSelector->registerForInvalidationCallbacks(this);
     m_activeTreeScopes.add(&document);
 }
 
 StyleEngine::~StyleEngine()
 {
     m_fontSelector->clearDocument();
     m_fontSelector->unregisterForInvalidationCallbacks(this);
 }
 
 void StyleEngine::addTreeScope(TreeScope& scope)
 {
     m_activeTreeScopes.add(&scope);
 }
 
 void StyleEngine::removeTreeScope(TreeScope& scope)
 {
     m_activeTreeScopes.remove(&scope);
 }
 
 void StyleEngine::updateActiveStyleSheets()
 {
     ASSERT(!m_document->inStyleRecalc());
     ASSERT(m_resolver);
 
     for (TreeScope* treeScope : m_activeTreeScopes)
         treeScope->styleSheets().updateActiveStyleSheets(*m_resolver);
-}
 
-void StyleEngine::appendActiveAuthorStyleSheets()
-{
-    for (TreeScope* treeScope : m_activeTreeScopes)
-        m_resolver->appendAuthorStyleSheets(treeScope->styleSheets().activeAuthorStyleSheets());
-
-    m_resolver->finishAppendAuthorStyleSheets();
-}
-
-void StyleEngine::createResolver()
-{
-    // It is a programming error to attempt to resolve style on a Document
-    // which is not in a frame. Code which hits this should have checked
-    // Document::isActive() before calling into code which could get here.
-
-    ASSERT(m_document->frame());
-
-    m_resolver = adoptPtr(new StyleResolver(*m_document));
-
-    appendActiveAuthorStyleSheets();
-}
-
-void StyleEngine::clearResolver()
-{
-    ASSERT(!m_document->inStyleRecalc());
-    m_resolver.clear();
+    m_document->renderView()->style()->font().update(fontSelector());
 }
 
 unsigned StyleEngine::resolverAccessCount() const
 {
-    return m_resolver ? m_resolver->accessCount() : 0;
+    return m_resolver->accessCount();
 }
 
 void StyleEngine::resolverChanged()
 {
     if (!m_document->isActive())
         return;
-    if (m_resolver)
-        updateActiveStyleSheets();
+    updateActiveStyleSheets();
 }
 
 void StyleEngine::clearFontCache()
 {
     m_fontSelector->fontFaceCache()->clearCSSConnected();
-    if (m_resolver)
-        m_resolver->invalidateMatchedPropertiesCache();
+    m_resolver->invalidateMatchedPropertiesCache();
 }
 
 void StyleEngine::updateGenericFontFamilySettings()
 {
     // FIXME: we should not update generic font family settings when
     // document is inactive.
     ASSERT(m_document->isActive());
 
     m_fontSelector->updateGenericFontFamilySettings(*m_document);
-    if (m_resolver)
-        m_resolver->invalidateMatchedPropertiesCache();
+    m_resolver->invalidateMatchedPropertiesCache();
 }
 
 PassRefPtr<CSSStyleSheet> StyleEngine::createSheet(Element* e, const String& text)
 {
     RefPtr<CSSStyleSheet> styleSheet;
     AtomicString textContent(text);
 
     HashMap<AtomicString, StyleSheetContents*>::AddResult result = m_textToSheetCache.add(textContent, nullptr);
     if (result.isNewEntry || !result.storedValue->value) {
         styleSheet = CSSStyleSheet::create(e, KURL());
@@ skipping 17 matching lines @@
     HashMap<StyleSheetContents*, AtomicString>::iterator it = m_sheetToTextCache.find(contents);
     if (it == m_sheetToTextCache.end())
         return;
 
     m_textToSheetCache.remove(it->value);
     m_sheetToTextCache.remove(contents);
 }
 
 void StyleEngine::fontsNeedUpdate(CSSFontSelector*)
 {
-    if (m_resolver)
-        m_resolver->invalidateMatchedPropertiesCache();
+    m_resolver->invalidateMatchedPropertiesCache();
     m_document->setNeedsStyleRecalc(SubtreeStyleChange);
 }
 
 }