Move MediaQueryResults to RuleFeatureSet.

third_party/WebKit/Source/core/css/RuleSet.cpp

Index: third_party/WebKit/Source/core/css/RuleSet.cpp
diff --git a/third_party/WebKit/Source/core/css/RuleSet.cpp b/third_party/WebKit/Source/core/css/RuleSet.cpp
index 79158f7991aecb107ded21e72240f2474bdbfc1d..b5eb29a96e63f25d4958f64bec882719f83631dd 100644
--- a/third_party/WebKit/Source/core/css/RuleSet.cpp
+++ b/third_party/WebKit/Source/core/css/RuleSet.cpp
@@ -300,10 +300,10 @@ void RuleSet::addChildRules(const HeapVector<Member<StyleRuleBase>>& rules,
       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));
@@ -330,8 +330,8 @@ void RuleSet::addRulesFromSheet(StyleSheetContents* sheet,
     if (importRule->styleSheet() &&
         (!importRule->mediaQueries() ||
          medium.eval(importRule->mediaQueries(),
-                     &m_viewportDependentMediaQueryResults,
-                     &m_deviceDependentMediaQueryResults)))
+                     &m_features.viewportDependentMediaQueryResults(),
+                     &m_features.deviceDependentMediaQueryResults())))
       addRulesFromSheet(importRule->styleSheet(), medium, addRuleFlags);
   }
 
@@ -418,8 +418,6 @@ DEFINE_TRACE(RuleSet) {
   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);