Simplify media query handling for stylesheets.

sky/engine/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/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 37 matching lines @@
 #include "sky/engine/core/css/ElementRuleCollector.h"
 #include "sky/engine/core/css/FontFace.h"
 #include "sky/engine/core/css/MediaQueryEvaluator.h"
 #include "sky/engine/core/css/RuleSet.h"
 #include "sky/engine/core/css/StyleKeyframe.h"
 #include "sky/engine/core/css/StylePropertySet.h"
 #include "sky/engine/core/css/StyleSheetContents.h"
 #include "sky/engine/core/css/parser/BisonCSSParser.h"
 #include "sky/engine/core/css/resolver/AnimatedStyleBuilder.h"
 #include "sky/engine/core/css/resolver/MatchResult.h"
-#include "sky/engine/core/css/resolver/MediaQueryResult.h"
 #include "sky/engine/core/css/resolver/SharedStyleFinder.h"
 #include "sky/engine/core/css/resolver/StyleAdjuster.h"
 #include "sky/engine/core/css/resolver/StyleBuilder.h"
 #include "sky/engine/core/css/resolver/StyleResolverState.h"
 #include "sky/engine/core/css/resolver/StyleResolverStats.h"
 #include "sky/engine/core/dom/NodeRenderStyle.h"
 #include "sky/engine/core/dom/StyleEngine.h"
 #include "sky/engine/core/dom/Text.h"
 #include "sky/engine/core/dom/shadow/ElementShadow.h"
 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
@@ skipping 42 matching lines @@
     styleSheet->parseString(cssText);
 
     ruleSet = RuleSet::create();
     ruleSet->addRulesFromSheet(styleSheet.get());
 
     return *ruleSet;
 }
 
 StyleResolver::StyleResolver(Document& document)
     : m_document(document)
-    , m_printMediaType(false)
     , m_styleResourceLoader(document.fetcher())
     , m_styleResolverStatsSequence(0)
     , m_accessCount(0)
 {
-    FrameView* view = document.view();
-    if (view) {
-        m_medium = adoptPtr(new MediaQueryEvaluator(&view->frame()));
-        m_printMediaType = equalIgnoringCase(view->mediaType(), MediaTypeNames::print);
-    } else {
-        m_medium = adoptPtr(new MediaQueryEvaluator("all"));
-    }
 }
 
 void StyleResolver::addToStyleSharingList(Element& element)
 {
     // Never add elements to the style sharing list if we're not in a recalcStyle,
     // otherwise we could leave stale pointers in there.
     if (!document().inStyleRecalc())
         return;
     ASSERT(element.supportsStyleSharing());
     INCREMENT_STYLE_STATS_COUNTER(*this, sharedStyleCandidates);
@@ skipping 554 matching lines @@
                 updateFont(state);
                 break;
             default:
                 break;
             }
             StyleBuilder::applyProperty(properties[i].property, state, properties[i].value);
         }
     }
 }
 
-void StyleResolver::resetMediaQueryAffectedByViewportChange()
-{
-    m_viewportDependentMediaQueryResults.clear();
-}
-
-void StyleResolver::addMediaQueryAffectedByViewportChange(const MediaQueryResultList& list)
-{
-    m_viewportDependentMediaQueryResults.appendVector(list);
-}
-
-bool StyleResolver::mediaQueryAffectedByViewportChange() const
-{
-    for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
-        if (m_medium->eval(m_viewportDependentMediaQueryResults[i]->expression()) != m_viewportDependentMediaQueryResults[i]->result())
-            return true;
-    }
-    return false;
-}
-
 } // namespace blink