Move Document global rule data to CSSGlobalRuleSet.

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 94 matching lines @@
 
   PassRefPtr<ComputedStyle> styleForPage(int pageIndex);
   PassRefPtr<ComputedStyle> styleForText(Text*);
 
   static PassRefPtr<ComputedStyle> styleForDocument(Document&);
 
   // FIXME: It could be better to call appendAuthorStyleSheets() directly after
   // we factor StyleResolver further.
   // https://bugs.webkit.org/show_bug.cgi?id=108890
   void appendAuthorStyleSheets(const HeapVector<Member<CSSStyleSheet>>&);
-  void resetRuleFeatures();
-  void finishAppendAuthorStyleSheets();
-
   void lazyAppendAuthorStyleSheets(unsigned firstNew,
                                    const HeapVector<Member<CSSStyleSheet>>&);
   void removePendingAuthorStyleSheets(const HeapVector<Member<CSSStyleSheet>>&);
   void appendPendingAuthorStyleSheets();
   bool hasPendingAuthorStyleSheets() const {
-    return m_pendingStyleSheets.size() > 0 || m_needCollectFeatures;
+    return m_pendingStyleSheets.size() > 0;
   }
 
   // TODO(esprehn): StyleResolver should probably not contain tree walking
   // state, instead we should pass a context object during recalcStyle.
   SelectorFilter& selectorFilter() { return m_selectorFilter; }
 
   StyleRuleKeyframes* findKeyframesRule(const Element*,
                                         const AtomicString& animationName);
 
   // These methods will give back the set of rules that matched for a given
@@ skipping 29 matching lines @@
   // FIXME: Rename to reflect the purpose, like didChangeFontSize or something.
   void invalidateMatchedPropertiesCache();
 
   void notifyResizeForViewportUnits();
 
   // Exposed for ComputedStyle::isStyleAvilable().
   static ComputedStyle* styleNotYetAvailable() {
     return s_styleNotYetAvailable;
   }
 
-  RuleFeatureSet& ensureUpdatedRuleFeatureSet() {
-    if (hasPendingAuthorStyleSheets())
-      appendPendingAuthorStyleSheets();
-    RELEASE_ASSERT(m_features.isAlive());
-    return m_features;
-  }
-
   StyleSharingList& styleSharingList();
 
-  bool hasRulesForId(const AtomicString&) const;
-  bool hasFullscreenUAStyle() const { return m_hasFullscreenUAStyle; }
-
   void addToStyleSharingList(Element&);
   void clearStyleSharingList();
 
   void increaseStyleSharingDepth() { ++m_styleSharingDepth; }
   void decreaseStyleSharingDepth() { --m_styleSharingDepth; }
 
   PseudoElement* createPseudoElementIfNeeded(Element& parent, PseudoId);
 
   DECLARE_TRACE();
 
-  void initWatchedSelectorRules();
-
  private:
   explicit StyleResolver(Document&);
 
   PassRefPtr<ComputedStyle> initialStyleForElement();
 
   // FIXME: This should probably go away, folded into FontBuilder.
   void updateFont(StyleResolverState&);
 
   void loadPendingResources(StyleResolverState&);
   void adjustComputedStyle(StyleResolverState&, Element*);
 
   void appendCSSStyleSheet(CSSStyleSheet&);
 
   void collectPseudoRulesForElement(const Element&,
                                     ElementRuleCollector&,
                                     PseudoId,
                                     unsigned rulesToInclude);
   void matchRuleSet(ElementRuleCollector&, RuleSet*);
   void matchUARules(ElementRuleCollector&);
   void matchScopedRules(const Element&, ElementRuleCollector&);
   void matchAuthorRules(const Element&, ElementRuleCollector&);
   void matchAuthorRulesV0(const Element&, ElementRuleCollector&);
   void matchAllRules(StyleResolverState&,
                      ElementRuleCollector&,
                      bool includeSMILProperties);
-  void collectFeatures();
   void collectTreeBoundaryCrossingRulesV0CascadeOrder(const Element&,
                                                       ElementRuleCollector&);
 
   void applyMatchedProperties(StyleResolverState&, const MatchResult&);
   bool applyAnimatedProperties(StyleResolverState&,
                                const Element* animatingElement);
   void applyCallbackSelectors(StyleResolverState&);
 
   template <CSSPropertyPriority priority>
   void applyMatchedProperties(StyleResolverState&,
@@ skipping 37 matching lines @@
 
   Member<MediaQueryEvaluator> m_medium;
   MediaQueryResultList m_viewportDependentMediaQueryResults;
   MediaQueryResultList m_deviceDependentMediaQueryResults;
 
   Member<Document> m_document;
   SelectorFilter m_selectorFilter;
 
   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;
-
-  bool m_needCollectFeatures;
   bool m_printMediaType;
-  bool m_hasFullscreenUAStyle = false;
 
   unsigned m_styleSharingDepth;
   HeapVector<Member<StyleSharingList>, styleSharingMaxDepth>
       m_styleSharingLists;
 };
 
 }  // namespace blink
 
 #endif  // StyleResolver_h