Move StyleResolver code out of ScopedStyleResolver.

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 13 matching lines @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "sky/engine/config.h"
 #include "sky/engine/core/css/resolver/ScopedStyleResolver.h"
 
 #include "sky/engine/core/css/CSSStyleSheet.h"
 #include "sky/engine/core/css/RuleFeature.h"
 #include "sky/engine/core/css/StyleRule.h"
 #include "sky/engine/core/css/StyleSheetContents.h"
-#include "sky/engine/core/css/resolver/StyleResolver.h"
-#include "sky/engine/core/dom/Document.h"
-#include "sky/engine/core/dom/shadow/ElementShadow.h"
-#include "sky/engine/core/dom/shadow/ShadowRoot.h"
-#include "sky/engine/core/html/HTMLStyleElement.h"
 
 namespace blink {
 
 ScopedStyleResolver::ScopedStyleResolver(TreeScope& scope)
     : m_scope(scope)
 {
 }
 
-void ScopedStyleResolver::addRulesFromSheet(CSSStyleSheet* cssSheet, StyleResolver* resolver)
+void ScopedStyleResolver::addRulesFromSheet(CSSStyleSheet* cssSheet)
 {
     m_authorStyleSheets.append(cssSheet);
-    unsigned index = m_authorStyleSheets.size() - 1;
-    StyleSheetContents* sheet = cssSheet->contents();
 
-    AddRuleFlags addRuleFlags = RuleHasNoSpecialState;
-    const RuleSet& ruleSet = sheet->ensureRuleSet(addRuleFlags);
-    resolver->addMediaQueryResults(ruleSet.viewportDependentMediaQueryResults());
-    resolver->processScopedRules(ruleSet, cssSheet, index, treeScope().rootNode());
-
+    const RuleSet& ruleSet = cssSheet->contents()->ensureRuleSet();
     m_features.add(ruleSet.features());
 }
 
 void ScopedStyleResolver::resetAuthorStyle()
 {
     m_authorStyleSheets.clear();
     m_features.clear();
 }
 
 const StyleRuleKeyframes* ScopedStyleResolver::keyframeStylesForAnimation(String animationName)
@@ skipping 11 matching lines @@
 void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& collector, bool includeEmptyRules, CascadeScope cascadeScope, CascadeOrder cascadeOrder)
 {
     RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange();
     for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) {
         MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet(), includeEmptyRules, &m_scope->rootNode(), m_authorStyleSheets[i], i);
         collector.collectMatchingRules(matchRequest, ruleRange, cascadeScope, cascadeOrder);
     }
 }
 
 } // namespace blink