Don't store a RuleFeatureSet on 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 26 matching lines @@
 #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::appendStyleSheet(CSSStyleSheet& sheet)
-{
-    MediaQueryEvaluator medium(m_scope.document().view());
-
-    if (sheet.mediaQueries() && !medium.eval(sheet.mediaQueries()))
-        return;
-
-    const RuleSet& ruleSet = sheet.contents()->ensureRuleSet();
-    m_features.add(ruleSet.features());
-}
-
 void ScopedStyleResolver::updateActiveStyleSheets()
 {
     Vector<RefPtr<CSSStyleSheet>> candidateSheets;
     collectStyleSheets(candidateSheets);
     m_authorStyleSheets.swap(candidateSheets);
 
     Node& root = m_scope.rootNode();
 
     // TODO(esprehn): We should avoid subtree recalcs in sky when rules change
     // and only recalc specific tree scopes.
     root.setNeedsStyleRecalc(SubtreeStyleChange);
 
     // TODO(esprehn): We should use LocalStyleChange, :host rule changes
     // can only impact the host directly as Sky has no descendant selectors.
     if (root.isShadowRoot())
         toShadowRoot(root).host()->setNeedsStyleRecalc(SubtreeStyleChange);
+}
 
-    m_features.clear();
+bool ScopedStyleResolver::hasSelectorForId(const AtomicString& id) const
+{
+    for (auto& sheet : m_authorStyleSheets) {
+        RuleSet& ruleSet = sheet->contents()->ensureRuleSet();
+        if (ruleSet.features().hasSelectorForId(id))
+            return true;
+    }
+    return false;
+}
 
-    for (RefPtr<CSSStyleSheet>& sheet : m_authorStyleSheets)
-        appendStyleSheet(*sheet);
+bool ScopedStyleResolver::hasSelectorForClass(const AtomicString& className) const
+{
+    for (auto& sheet : m_authorStyleSheets) {
+        RuleSet& ruleSet = sheet->contents()->ensureRuleSet();
+        if (ruleSet.features().hasSelectorForClass(className))
+            return true;
+    }
+    return false;
+}
+
+bool ScopedStyleResolver::hasSelectorForAttribute(const AtomicString& attributeName) const
+{
+    for (auto& sheet : m_authorStyleSheets) {
+        RuleSet& ruleSet = sheet->contents()->ensureRuleSet();
+        if (ruleSet.features().hasSelectorForAttribute(attributeName))
+            return true;
+    }
+    return false;
 }
 
 void ScopedStyleResolver::addStyleSheetCandidateNode(HTMLStyleElement& element)
 {
     ASSERT(element.inActiveDocument());
     m_styleSheetCandidateNodes.add(&element);
 }
 
 void ScopedStyleResolver::removeStyleSheetCandidateNode(HTMLStyleElement& element)
 {
     m_styleSheetCandidateNodes.remove(&element);
 }
 
 void ScopedStyleResolver::collectStyleSheets(Vector<RefPtr<CSSStyleSheet>>& sheets)
 {
+    MediaQueryEvaluator medium(m_scope.document().view());
+
     for (Node* node : m_styleSheetCandidateNodes) {
         ASSERT(isHTMLStyleElement(*node));
-        if (CSSStyleSheet* sheet = toHTMLStyleElement(node)->sheet())
+        CSSStyleSheet* sheet = toHTMLStyleElement(node)->sheet();
+        if (sheet && (!sheet->mediaQueries() || medium.eval(sheet->mediaQueries()))) {
             sheets.append(sheet);
+        }
     }
 }
 
 const StyleRuleKeyframes* ScopedStyleResolver::keyframeStylesForAnimation(String animationName)
 {
     for (auto& sheet : m_authorStyleSheets) {
         // TODO(esprehn): Maybe just store the keyframes in a map?
-        for (auto& rule : sheet->contents()->ruleSet().keyframesRules()) {
+        for (auto& rule : sheet->contents()->ensureRuleSet().keyframesRules()) {
             if (rule->name() == animationName)
                 return rule.get();
         }
     }
     return nullptr;
 }
 
 void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& collector, CascadeOrder cascadeOrder)
 {
     for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) {
-        MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet(), m_authorStyleSheets[i].get(), i);
+        MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ensureRuleSet(), m_authorStyleSheets[i].get(), i);
         collector.collectMatchingRules(matchRequest, cascadeOrder);
     }
 }
 
 void ScopedStyleResolver::collectMatchingHostRules(ElementRuleCollector& collector, CascadeOrder cascadeOrder)
 {
     for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) {
-        MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet(), m_authorStyleSheets[i].get(), i);
+        MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ensureRuleSet(), m_authorStyleSheets[i].get(), i);
         collector.collectMatchingHostRules(matchRequest, cascadeOrder);
     }
 }
 
 } // namespace blink