Collect @viewport before constructing RuleSets.

third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
index 5341004566b9fe48d9347c16ad77cdaf467d5df5..ff54a4ed06a4a8d8abde74ca375ab3d3e60aa0ec 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
@@ -72,7 +72,6 @@
 #include "core/css/resolver/StyleAdjuster.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/css/resolver/StyleResolverStats.h"
-#include "core/css/resolver/ViewportStyleResolver.h"
 #include "core/dom/CSSSelectorWatch.h"
 #include "core/dom/FirstLetterPseudoElement.h"
 #include "core/dom/NodeComputedStyle.h"
@@ -182,7 +181,6 @@ static void collectScopedResolversForHostedShadowTrees(
 
 StyleResolver::StyleResolver(Document& document)
     : m_document(document),
-      m_viewportStyleResolver(ViewportStyleResolver::create(document)),
       m_needCollectFeatures(false),
       m_printMediaType(false),
       m_styleSharingDepth(0) {
@@ -291,8 +289,6 @@ void StyleResolver::finishAppendAuthorStyleSheets() {
     document().layoutViewItem().style()->font().update(
         document().styleEngine().fontSelector());
 
-  m_viewportStyleResolver->collectViewportRules();
-
   document().styleEngine().resetCSSFeatureFlags(m_features);
 }
 
@@ -1677,7 +1673,6 @@ void StyleResolver::invalidateMatchedPropertiesCache() {
 }
 
 void StyleResolver::notifyResizeForViewportUnits() {
-  m_viewportStyleResolver->collectViewportRules();
   m_matchedPropertiesCache.clearViewportDependent();
 }
 
@@ -1944,7 +1939,6 @@ DEFINE_TRACE(StyleResolver) {
   visitor->trace(m_viewportDependentMediaQueryResults);
   visitor->trace(m_deviceDependentMediaQueryResults);
   visitor->trace(m_selectorFilter);
-  visitor->trace(m_viewportStyleResolver);
   visitor->trace(m_features);
   visitor->trace(m_siblingRuleSet);
   visitor->trace(m_uncommonAttributeRuleSet);