Move MediaQueryResults to RuleFeatureSet.

third_party/WebKit/Source/core/css/RuleSet.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 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/)
@@ skipping 282 matching lines @@
           m_slottedPseudoElementRules.append(
               MinimalRuleData(styleRule, selectorIndex, addRuleFlags));
         } else {
           addRule(styleRule, selectorIndex, addRuleFlags);
         }
       }
     } else if (rule->isPageRule()) {
       addPageRule(toStyleRulePage(rule));
     } else if (rule->isMediaRule()) {
       StyleRuleMedia* mediaRule = toStyleRuleMedia(rule);
-      if ((!mediaRule->mediaQueries() ||
-           medium.eval(mediaRule->mediaQueries(),
-                       &m_viewportDependentMediaQueryResults,
-                       &m_deviceDependentMediaQueryResults)))
+      if (!mediaRule->mediaQueries() ||
+          medium.eval(mediaRule->mediaQueries(),
+                      &m_features.viewportDependentMediaQueryResults(),
+                      &m_features.deviceDependentMediaQueryResults()))
         addChildRules(mediaRule->childRules(), medium, addRuleFlags);
     } else if (rule->isFontFaceRule()) {
       addFontFaceRule(toStyleRuleFontFace(rule));
     } else if (rule->isKeyframesRule()) {
       addKeyframesRule(toStyleRuleKeyframes(rule));
     } else if (rule->isSupportsRule() &&
                toStyleRuleSupports(rule)->conditionIsSupported()) {
       addChildRules(toStyleRuleSupports(rule)->childRules(), medium,
                     addRuleFlags);
     }
   }
 }
 
 void RuleSet::addRulesFromSheet(StyleSheetContents* sheet,
                                 const MediaQueryEvaluator& medium,
                                 AddRuleFlags addRuleFlags) {
   TRACE_EVENT0("blink", "RuleSet::addRulesFromSheet");
 
   ASSERT(sheet);
 
   const HeapVector<Member<StyleRuleImport>>& importRules = sheet->importRules();
   for (unsigned i = 0; i < importRules.size(); ++i) {
     StyleRuleImport* importRule = importRules[i].get();
     if (importRule->styleSheet() &&
         (!importRule->mediaQueries() ||
          medium.eval(importRule->mediaQueries(),
-                     &m_viewportDependentMediaQueryResults,
-                     &m_deviceDependentMediaQueryResults)))
+                     &m_features.viewportDependentMediaQueryResults(),
+                     &m_features.deviceDependentMediaQueryResults())))
       addRulesFromSheet(importRule->styleSheet(), medium, addRuleFlags);
   }
 
   addChildRules(sheet->childRules(), medium, addRuleFlags);
 }
 
 void RuleSet::addStyleRule(StyleRule* rule, AddRuleFlags addRuleFlags) {
   for (size_t selectorIndex = 0; selectorIndex != kNotFound;
        selectorIndex =
            rule->selectorList().indexOfNextSelectorAfter(selectorIndex))
@@ skipping 66 matching lines @@
   visitor->trace(m_placeholderPseudoRules);
   visitor->trace(m_universalRules);
   visitor->trace(m_shadowHostRules);
   visitor->trace(m_features);
   visitor->trace(m_pageRules);
   visitor->trace(m_fontFaceRules);
   visitor->trace(m_keyframesRules);
   visitor->trace(m_deepCombinatorOrShadowPseudoRules);
   visitor->trace(m_contentPseudoElementRules);
   visitor->trace(m_slottedPseudoElementRules);
-  visitor->trace(m_viewportDependentMediaQueryResults);
-  visitor->trace(m_deviceDependentMediaQueryResults);
   visitor->trace(m_pendingRules);
 #ifndef NDEBUG
   visitor->trace(m_allRules);
 #endif
 }
 
 #ifndef NDEBUG
 void RuleSet::show() const {
   for (const auto& rule : m_allRules)
     rule.selector().show();
 }
 #endif
 
 }  // namespace blink