Move StyleResolver code out of ScopedStyleResolver.

sky/engine/core/css/resolver/StyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 70 matching lines @@
     // If any changes to CSS Animations were detected, stash the update away for application after the
     // render object is updated if we're in the appropriate scope.
     if (state.animationUpdate())
         element.ensureActiveAnimations().cssAnimations().setPendingUpdate(state.takeAnimationUpdate());
 }
 
 } // namespace
 
 namespace blink {
 
-static void addFontFaceRule(Document* document, CSSFontSelector* cssFontSelector, const StyleRuleFontFace* fontFaceRule)
-{
-    RefPtr<FontFace> fontFace = FontFace::create(document, fontFaceRule);
-    if (fontFace)
-        cssFontSelector->fontFaceCache()->add(cssFontSelector, fontFaceRule, fontFace);
-}
-
 static RuleSet& defaultStyles()
 {
     DEFINE_STATIC_LOCAL(RefPtr<StyleSheetContents>, styleSheet, ());
     DEFINE_STATIC_LOCAL(OwnPtr<RuleSet>, ruleSet, ());
 
     if (ruleSet)
         return *ruleSet;
 
     String cssText =
         "link, import, meta, script, style, template, title {\n"
@@ skipping 49 matching lines @@
     ASSERT(cssSheet);
     if (cssSheet->mediaQueries() && !m_medium->eval(cssSheet->mediaQueries(), &m_viewportDependentMediaQueryResults))
         return;
 
     Node* ownerNode = cssSheet->ownerNode();
     if (!ownerNode)
         return;
 
     TreeScope& treeScope = ownerNode->treeScope();
     ScopedStyleResolver& resolver = treeScope.scopedStyleResolver();
-    resolver.addRulesFromSheet(cssSheet, this);
+    resolver.addRulesFromSheet(cssSheet);
+
+    RuleSet& ruleSet = cssSheet->contents()->ruleSet();
+
+    const MediaQueryResultList& list = ruleSet.viewportDependentMediaQueryResults();
+    for (size_t i = 0; i < list.size(); ++i)
+        m_viewportDependentMediaQueryResults.append(list[i]);
+
+    // FIXME(BUG 72461): We don't add @font-face rules of scoped style sheets for the moment.
+    if (ownerNode->isDocumentNode()) {
+        CSSFontSelector* fontSelector = document().styleEngine()->fontSelector();
+        const Vector<RawPtr<StyleRuleFontFace> > fontFaceRules = ruleSet.fontFaceRules();
+        for (unsigned i = 0; i < fontFaceRules.size(); ++i) {
+            if (RefPtr<FontFace> fontFace = FontFace::create(&document(), fontFaceRules[i]))
+                fontSelector->fontFaceCache()->add(fontSelector, fontFaceRules[i], fontFace);
+        }
+        if (fontFaceRules.size())
+            invalidateMatchedPropertiesCache();
+    }
 }
 
 void StyleResolver::appendPendingAuthorStyleSheets()
 {
     for (ListHashSet<RawPtr<CSSStyleSheet>, 16>::iterator it = m_pendingStyleSheets.begin(); it != m_pendingStyleSheets.end(); ++it)
         appendCSSStyleSheet(*it);
 
     m_pendingStyleSheets.clear();
     finishAppendAuthorStyleSheets();
 }
 
 void StyleResolver::appendAuthorStyleSheets(const Vector<RefPtr<CSSStyleSheet> >& styleSheets)
 {
     // This handles sheets added to the end of the stylesheet list only. In other cases the style resolver
     // needs to be reconstructed. To handle insertions too the rule order numbers would need to be updated.
     unsigned size = styleSheets.size();
     for (unsigned i = 0; i < size; ++i)
         appendCSSStyleSheet(styleSheets[i].get());
 }
 
 void StyleResolver::finishAppendAuthorStyleSheets()
 {
     if (document().renderView() && document().renderView()->style())
         document().renderView()->style()->font().update(document().styleEngine()->fontSelector());
 }
 
-void StyleResolver::processScopedRules(const RuleSet& authorRules, CSSStyleSheet* parentStyleSheet, unsigned parentIndex, ContainerNode& scope)
-{
-    // FIXME(BUG 72461): We don't add @font-face rules of scoped style sheets for the moment.
-    if (scope.isDocumentNode()) {
-        const Vector<RawPtr<StyleRuleFontFace> > fontFaceRules = authorRules.fontFaceRules();
-        for (unsigned i = 0; i < fontFaceRules.size(); ++i)
-            addFontFaceRule(m_document, document().styleEngine()->fontSelector(), fontFaceRules[i]);
-        if (fontFaceRules.size())
-            invalidateMatchedPropertiesCache();
-    }
-}
-
 void StyleResolver::addToStyleSharingList(Element& element)
 {
     // Never add elements to the style sharing list if we're not in a recalcStyle,
     // otherwise we could leave stale pointers in there.
     if (!document().inStyleRecalc())
         return;
     ASSERT(element.supportsStyleSharing());
     INCREMENT_STYLE_STATS_COUNTER(*this, sharedStyleCandidates);
     StyleSharingList& list = styleSharingList();
     if (list.size() >= styleSharingListSize)
@@ skipping 577 matching lines @@
                 updateFont(state);
                 break;
             default:
                 break;
             }
             StyleBuilder::applyProperty(properties[i].property, state, properties[i].value);
         }
     }
 }
 
-void StyleResolver::addMediaQueryResults(const MediaQueryResultList& list)
-{
-    for (size_t i = 0; i < list.size(); ++i)
-        m_viewportDependentMediaQueryResults.append(list[i]);
-}
-
 bool StyleResolver::mediaQueryAffectedByViewportChange() const
 {
     for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
         if (m_medium->eval(m_viewportDependentMediaQueryResults[i]->expression()) != m_viewportDependentMediaQueryResults[i]->result())
             return true;
     }
     return false;
 }
 
 } // namespace blink