Separate @viewport from other RuleSet construction.

third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.h

 /*
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 14 matching lines @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef ViewportStyleResolver_h
 #define ViewportStyleResolver_h
 
 #include "core/CSSPropertyNames.h"
 #include "core/CoreExport.h"
+#include "core/css/MediaQueryEvaluator.h"
 #include "core/css/RuleSet.h"
 #include "platform/Length.h"
 
 namespace blink {
 
 class Document;
 class MutableStylePropertySet;
 class StyleRuleViewport;
 
 class CORE_EXPORT ViewportStyleResolver
     : public GarbageCollected<ViewportStyleResolver> {
  public:
   static ViewportStyleResolver* create(Document* document) {
     return new ViewportStyleResolver(document);
   }
 
-  enum Origin { UserAgentOrigin, AuthorOrigin };
-
-  void collectViewportRules();
-  void collectViewportRules(RuleSet*, Origin);
+  void reset();
+  void collectViewportRulesFromUASheets();
+  void collectViewportRulesFromAuthorSheet(const CSSStyleSheet&);
   void resolve();
+  bool isAffectedByInitialViewportChange();
 
   DECLARE_TRACE();
 
  private:
   explicit ViewportStyleResolver(Document*);
 
-  void addViewportRule(StyleRuleViewport*, Origin);
+  enum Origin { UserAgentOrigin, AuthorOrigin };
+
+  void collectViewportChildRules(const HeapVector<Member<StyleRuleBase>>&,
+                                 Origin);
+  void addViewportRule(StyleRuleViewport&, Origin);
 
   float viewportArgumentValue(CSSPropertyID) const;
-  Length viewportLengthValue(CSSPropertyID) const;
+  Length viewportLengthValue(CSSPropertyID);
 
   Member<Document> m_document;
   Member<MutableStylePropertySet> m_propertySet;
-  bool m_hasAuthorStyle;
+  Member<MediaQueryEvaluator> m_initialViewportMedium;
+  MediaQueryResultList m_viewportDependentMediaQueryResults;
+  MediaQueryResultList m_deviceDependentMediaQueryResults;
+  bool m_hasAuthorStyle = false;
+  bool m_hasViewportUnits = false;
 };
 
 }  // namespace blink
 
 #endif  // ViewportStyleResolver_h