Move MediaQueryResults to RuleFeatureSet.

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.
  *
  * 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 StyleResolver_h
 #define StyleResolver_h
 
 #include "core/CoreExport.h"
 #include "core/animation/PropertyHandle.h"
 #include "core/css/ElementRuleCollector.h"
 #include "core/css/PseudoStyleRequest.h"
-#include "core/css/RuleFeature.h"
-#include "core/css/RuleSet.h"
 #include "core/css/SelectorChecker.h"
 #include "core/css/SelectorFilter.h"
 #include "core/css/resolver/CSSPropertyPriority.h"
 #include "core/css/resolver/MatchedPropertiesCache.h"
 #include "core/css/resolver/StyleBuilder.h"
 #include "core/style/CachedUAStyle.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Deque.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/ListHashSet.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class AnimatableValue;
 class CSSRuleList;
 class CSSStyleSheet;
 class CSSValue;
 class Document;
 class Element;
 class Interpolation;
 class MatchResult;
 class MediaQueryEvaluator;
+class RuleSet;
 class StylePropertySet;
 class StyleRule;
 class StyleRuleUsageTracker;
 
 enum StyleSharingBehavior {
   AllowStyleSharing,
   DisallowStyleSharing,
 };
 
 enum RuleMatchingBehavior { MatchAllRules, MatchAllRulesExcludingSMIL };
@@ skipping 74 matching lines @@
       Element*,
       unsigned rulesToInclude = AllButEmptyCSSRules);
   CSSRuleList* pseudoCSSRulesForElement(
       Element*,
       PseudoId,
       unsigned rulesToInclude = AllButEmptyCSSRules);
   StyleRuleList* styleRulesForElement(Element*, unsigned rulesToInclude);
 
   void computeFont(ComputedStyle*, const StylePropertySet&);
 
-  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();
 
   void notifyResizeForViewportUnits();
 
   // Exposed for ComputedStyle::isStyleAvilable().
   static ComputedStyle* styleNotYetAvailable() {
     return s_styleNotYetAvailable;
   }
 
@@ skipping 108 matching lines @@
 
   PseudoElement* createPseudoElement(Element* parent, PseudoId);
 
   Document& document() const { return *m_document; }
 
   static ComputedStyle* s_styleNotYetAvailable;
 
   MatchedPropertiesCache m_matchedPropertiesCache;
 
   MediaQueryResultList m_viewportDependentMediaQueryResults;
   MediaQueryResultList m_deviceDependentMediaQueryResults;

[rune, 2016/11/23 13:37:42]

These should have been removed.

[rune, 2016/11/23 13:46:54]

Done.

 
   Member<Document> m_document;
   SelectorFilter m_selectorFilter;
 
   HeapListHashSet<Member<CSSStyleSheet>, 16> m_pendingStyleSheets;
 
   Member<StyleRuleUsageTracker> m_tracker;
 
   bool m_printMediaType = false;
 
   unsigned m_styleSharingDepth = 0;
   HeapVector<Member<StyleSharingList>, styleSharingMaxDepth>
       m_styleSharingLists;
 };
 
 }  // namespace blink
 
 #endif  // StyleResolver_h