Simplify media query handling for stylesheets.

sky/engine/core/css/resolver/StyleResolver.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef SKY_ENGINE_CORE_CSS_RESOLVER_STYLERESOLVER_H_
 #define SKY_ENGINE_CORE_CSS_RESOLVER_STYLERESOLVER_H_
 
 #include "sky/engine/core/css/MediaQueryEvaluator.h"
 #include "sky/engine/core/css/resolver/MatchedPropertiesCache.h"
-#include "sky/engine/core/css/resolver/MediaQueryResult.h"
 #include "sky/engine/core/css/resolver/ScopedStyleResolver.h"
 #include "sky/engine/core/css/resolver/StyleResourceLoader.h"
 #include "sky/engine/platform/heap/Handle.h"
 #include "sky/engine/wtf/Deque.h"
 #include "sky/engine/wtf/HashMap.h"
 #include "sky/engine/wtf/RefPtr.h"
 #include "sky/engine/wtf/Vector.h"
 
 namespace blink {
 
@@ skipping 47 matching lines @@
     void styleTreeResolveScopedKeyframesRules(const Element*, Vector<RawPtr<ScopedStyleResolver>, 8>&);
 
     // |properties| is an array with |count| elements.
     void applyPropertiesToStyle(const CSSPropertyValue* properties, size_t count, RenderStyle*);
 
     bool mediaQueryAffectedByViewportChange() const;
 
     // FIXME: Rename to reflect the purpose, like didChangeFontSize or something.
     void invalidateMatchedPropertiesCache();
 
-    MediaQueryEvaluator& medium() const { return *m_medium; }
-
-    void resetMediaQueryAffectedByViewportChange();
-    void addMediaQueryAffectedByViewportChange(const MediaQueryResultList&);
-
     void notifyResizeForViewportUnits();
 
     StyleSharingList& styleSharingList() { return m_styleSharingList; }
 
     void addToStyleSharingList(Element&);
     void clearStyleSharingList();
 
     StyleResolverStats* stats() { return m_styleResolverStats.get(); }
     StyleResolverStats* statsTotals() { return m_styleResolverStatsTotals.get(); }
     enum StatsReportType { ReportDefaultStats, ReportSlowStats };
@@ skipping 32 matching lines @@
     template <StyleApplicationPass pass>
     void applyProperties(StyleResolverState&, const StylePropertySet* properties, bool isImportant, bool inheritedOnly);
     template <StyleApplicationPass pass>
     void applyAnimatedProperties(StyleResolverState&, const HashMap<CSSPropertyID, RefPtr<Interpolation> >&);
     template <StyleResolver::StyleApplicationPass pass>
     void applyAllProperty(StyleResolverState&, CSSValue*);
 
     MatchedPropertiesCache m_matchedPropertiesCache;
 
     OwnPtr<MediaQueryEvaluator> m_medium;
-    MediaQueryResultList m_viewportDependentMediaQueryResults;
 
     RawPtr<Document> m_document;
 
-    bool m_printMediaType;
-
     StyleResourceLoader m_styleResourceLoader;
 
     StyleSharingList m_styleSharingList;
 
     OwnPtr<StyleResolverStats> m_styleResolverStats;
     OwnPtr<StyleResolverStats> m_styleResolverStatsTotals;
     unsigned m_styleResolverStatsSequence;
 
     // Use only for Internals::updateStyleAndReturnAffectedElementCount.
     unsigned m_accessCount;
 };
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_CORE_CSS_RESOLVER_STYLERESOLVER_H_