Separate @viewport from other RuleSet construction.

third_party/WebKit/Source/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.
  *
@@ skipping 41 matching lines @@
 class CSSValue;
 class ContainerNode;
 class Document;
 class Element;
 class Interpolation;
 class MatchResult;
 class MediaQueryEvaluator;
 class ScopedStyleResolver;
 class StylePropertySet;
 class StyleRule;
-class ViewportStyleResolver;
 
 enum StyleSharingBehavior {
   AllowStyleSharing,
   DisallowStyleSharing,
 };
 
 enum RuleMatchingBehavior { MatchAllRules, MatchAllRulesExcludingSMIL };
 
 const unsigned styleSharingListSize = 15;
 const unsigned styleSharingMaxDepth = 32;
@@ skipping 75 matching lines @@
       Element*,
       unsigned rulesToInclude = AllButEmptyCSSRules);
   CSSRuleList* pseudoCSSRulesForElement(
       Element*,
       PseudoId,
       unsigned rulesToInclude = AllButEmptyCSSRules);
   StyleRuleList* styleRulesForElement(Element*, unsigned rulesToInclude);
 
   void computeFont(ComputedStyle*, const StylePropertySet&);
 
-  ViewportStyleResolver* viewportStyleResolver() {
-    return m_viewportStyleResolver.get();
-  }
-
   void addViewportDependentMediaQueries(const MediaQueryResultList&);
   bool hasViewportDependentMediaQueries() const {
     return !m_viewportDependentMediaQueryResults.isEmpty();
   }
   bool mediaQueryAffectedByViewportChange() const;
   void addDeviceDependentMediaQueries(const MediaQueryResultList&);
   bool mediaQueryAffectedByDeviceChange() const;
 
   // FIXME: Rename to reflect the purpose, like didChangeFontSize or something.
   void invalidateMatchedPropertiesCache();
@@ skipping 103 matching lines @@
 
   MatchedPropertiesCache m_matchedPropertiesCache;
 
   Member<MediaQueryEvaluator> m_medium;
   MediaQueryResultList m_viewportDependentMediaQueryResults;
   MediaQueryResultList m_deviceDependentMediaQueryResults;
 
   Member<Document> m_document;
   SelectorFilter m_selectorFilter;
 
-  Member<ViewportStyleResolver> m_viewportStyleResolver;
-
   HeapListHashSet<Member<CSSStyleSheet>, 16> m_pendingStyleSheets;
 
   // FIXME: The entire logic of collecting features on StyleResolver, as well as
   // transferring them between various parts of machinery smells wrong. This
   // needs to be better somehow.
   RuleFeatureSet m_features;
   Member<RuleSet> m_siblingRuleSet;
   Member<RuleSet> m_uncommonAttributeRuleSet;
   Member<RuleSet> m_watchedSelectorsRules;
 
   DocumentOrderedList m_treeBoundaryCrossingScopes;
 
   bool m_needCollectFeatures;
   bool m_printMediaType;
   bool m_hasFullscreenUAStyle = false;
 
   unsigned m_styleSharingDepth;
   HeapVector<Member<StyleSharingList>, styleSharingMaxDepth>
       m_styleSharingLists;
 };
 
 }  // namespace blink
 
 #endif  // StyleResolver_h