Simplify media query handling for stylesheets.

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 28 matching lines @@
 
 namespace blink {
 
 ScopedStyleResolver::ScopedStyleResolver(TreeScope& scope)
     : m_scope(scope)
 {
 }
 
 void ScopedStyleResolver::appendStyleSheet(CSSStyleSheet& sheet)
 {
-    Document& document = m_scope.document();
-    StyleResolver& styleResolver = document.styleResolver();
-    MediaQueryEvaluator& medium  = styleResolver.medium();
+    MediaQueryEvaluator medium(m_scope.document().view());
 
-    if (sheet.mediaQueries() && !medium.eval(sheet.mediaQueries(), &m_viewportDependentMediaQueryResults))
+    if (sheet.mediaQueries() && !medium.eval(sheet.mediaQueries()))
         return;
 
-    styleResolver.addMediaQueryAffectedByViewportChange(m_viewportDependentMediaQueryResults);
-
     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();
-    m_viewportDependentMediaQueryResults.clear();
 
     for (RefPtr<CSSStyleSheet>& sheet : m_authorStyleSheets)
         appendStyleSheet(*sheet);
 }
 
-const MediaQueryResultList& ScopedStyleResolver::viewportDependentMediaQueryResults() const
-{
-    return m_viewportDependentMediaQueryResults;
-}
-
 void ScopedStyleResolver::addStyleSheetCandidateNode(HTMLStyleElement& element)
 {
     ASSERT(element.inActiveDocument());
     m_styleSheetCandidateNodes.add(&element);
 }
 
 void ScopedStyleResolver::removeStyleSheetCandidateNode(HTMLStyleElement& element)
 {
     m_styleSheetCandidateNodes.remove(&element);
 }
@@ skipping 31 matching lines @@
 void ScopedStyleResolver::collectMatchingHostRules(ElementRuleCollector& collector, 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(), m_authorStyleSheets[i].get(), i);
         collector.collectMatchingHostRules(matchRequest, ruleRange, cascadeOrder);
     }
 }
 
 } // namespace blink