Move MediaQueryResults to RuleFeatureSet.

third_party/WebKit/Source/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/)
@@ skipping 195 matching lines @@
 }
 
 void StyleResolver::appendCSSStyleSheet(CSSStyleSheet& cssSheet) {
   DCHECK(!cssSheet.disabled());
   DCHECK(cssSheet.ownerDocument());
   DCHECK(cssSheet.ownerNode());
   DCHECK(isHTMLStyleElement(cssSheet.ownerNode()) ||
          isSVGStyleElement(cssSheet.ownerNode()) ||
          cssSheet.ownerNode()->isConnected());
 
-  const MediaQueryEvaluator& evaluator =
-      document().styleEngine().ensureMediaQueryEvaluator();
-  if (cssSheet.mediaQueries() &&
-      !evaluator.eval(cssSheet.mediaQueries(),
-                      &m_viewportDependentMediaQueryResults,
-                      &m_deviceDependentMediaQueryResults))
-    return;
-
   TreeScope* treeScope = &cssSheet.ownerNode()->treeScope();
   // TODO(rune@opera.com): This is a workaround for crbug.com/559292
   // when we're in the middle of removing a subtree with a style element
   // and the treescope has been changed but inDocument and isInShadowTree
   // are not.
   //
   // This check can be removed when crbug.com/567021 is fixed.
   if (cssSheet.ownerNode()->isInShadowTree() &&
       treeScope->rootNode().isDocumentNode())
     return;
 
   // Sheets in the document scope of HTML imports apply to the main document
   // (m_document), so we override it for all document scoped sheets.
   if (treeScope->rootNode().isDocumentNode())
     treeScope = m_document;
-  treeScope->ensureScopedStyleResolver().appendCSSStyleSheet(cssSheet,
-                                                             evaluator);
+  treeScope->ensureScopedStyleResolver().appendCSSStyleSheet(cssSheet);
 }
 
 void StyleResolver::appendPendingAuthorStyleSheets() {
   for (const auto& styleSheet : m_pendingStyleSheets)
     appendCSSStyleSheet(*styleSheet);
 
   m_pendingStyleSheets.clear();
 }
 
 void StyleResolver::appendAuthorStyleSheets(
@@ skipping 1586 matching lines @@
   state.setStyle(style);
 
   for (CSSPropertyID property : properties) {
     if (property == CSSPropertyLineHeight)
       updateFont(state);
     StyleBuilder::applyProperty(property, state,
                                 *propertySet.getPropertyCSSValue(property));
   }
 }
 
-void StyleResolver::addViewportDependentMediaQueries(
-    const MediaQueryResultList& list) {
-  for (size_t i = 0; i < list.size(); ++i)
-    m_viewportDependentMediaQueryResults.append(list[i]);
-}
-
-void StyleResolver::addDeviceDependentMediaQueries(
-    const MediaQueryResultList& list) {
-  for (size_t i = 0; i < list.size(); ++i)
-    m_deviceDependentMediaQueryResults.append(list[i]);
-}
-
-bool StyleResolver::mediaQueryAffectedByViewportChange() const {
-  const MediaQueryEvaluator& evaluator =
-      document().styleEngine().ensureMediaQueryEvaluator();
-  for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
-    if (evaluator.eval(m_viewportDependentMediaQueryResults[i]->expression()) !=
-        m_viewportDependentMediaQueryResults[i]->result())
-      return true;
-  }
-  return false;
-}
-
-bool StyleResolver::mediaQueryAffectedByDeviceChange() const {
-  const MediaQueryEvaluator& evaluator =
-      document().styleEngine().ensureMediaQueryEvaluator();
-  for (unsigned i = 0; i < m_deviceDependentMediaQueryResults.size(); ++i) {
-    if (evaluator.eval(m_deviceDependentMediaQueryResults[i]->expression()) !=
-        m_deviceDependentMediaQueryResults[i]->result())
-      return true;
-  }
-  return false;
-}
-
 void StyleResolver::updateMediaType() {
   if (FrameView* view = document().view()) {
     m_printMediaType =
         equalIgnoringCase(view->mediaType(), MediaTypeNames::print);
   }
 }
 
 DEFINE_TRACE(StyleResolver) {
   visitor->trace(m_matchedPropertiesCache);
-  visitor->trace(m_viewportDependentMediaQueryResults);
-  visitor->trace(m_deviceDependentMediaQueryResults);
   visitor->trace(m_selectorFilter);
   visitor->trace(m_styleSharingLists);
   visitor->trace(m_pendingStyleSheets);
   visitor->trace(m_document);
   visitor->trace(m_tracker);
 }
 
 }  // namespace blink