Collect @viewport before constructing RuleSets.

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
@@ skipping 54 matching lines @@
 #include "core/css/resolver/AnimatedStyleBuilder.h"
 #include "core/css/resolver/CSSVariableResolver.h"
 #include "core/css/resolver/MatchResult.h"
 #include "core/css/resolver/MediaQueryResult.h"
 #include "core/css/resolver/ScopedStyleResolver.h"
 #include "core/css/resolver/SelectorFilterParentScope.h"
 #include "core/css/resolver/SharedStyleFinder.h"
 #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"
 #include "core/dom/StyleEngine.h"
 #include "core/dom/Text.h"
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
@@ skipping 89 matching lines @@
        shadowRoot = shadowRoot->olderShadowRoot()) {
     if (shadowRoot->numberOfStyles() > 0) {
       if (ScopedStyleResolver* resolver = shadowRoot->scopedStyleResolver())
         resolvers.append(resolver);
     }
   }
 }
 
 StyleResolver::StyleResolver(Document& document)
     : m_document(document),
-      m_viewportStyleResolver(ViewportStyleResolver::create(document)),
       m_needCollectFeatures(false),
       m_printMediaType(false),
       m_styleSharingDepth(0) {
   FrameView* view = document.view();
   if (view) {
     m_medium = new MediaQueryEvaluator(&view->frame());
     m_printMediaType =
         equalIgnoringCase(view->mediaType(), MediaTypeNames::print);
   } else {
     m_medium = new MediaQueryEvaluator("all");
@@ skipping 88 matching lines @@
 }
 
 void StyleResolver::finishAppendAuthorStyleSheets() {
   collectFeatures();
 
   if (!document().layoutViewItem().isNull() &&
       document().layoutViewItem().style())
     document().layoutViewItem().style()->font().update(
         document().styleEngine().fontSelector());
 
-  m_viewportStyleResolver->collectViewportRules();
-
   document().styleEngine().resetCSSFeatureFlags(m_features);
 }
 
 void StyleResolver::resetRuleFeatures() {
   // Need to recreate RuleFeatureSet.
   m_features.clear();
   m_siblingRuleSet.clear();
   m_uncommonAttributeRuleSet.clear();
   m_needCollectFeatures = true;
 }
@@ skipping 1364 matching lines @@
     const MatchedProperties* properties,
     unsigned size) {
   return StringHasher::hashMemory(properties, sizeof(MatchedProperties) * size);
 }
 
 void StyleResolver::invalidateMatchedPropertiesCache() {
   m_matchedPropertiesCache.clear();
 }
 
 void StyleResolver::notifyResizeForViewportUnits() {
-  m_viewportStyleResolver->collectViewportRules();
   m_matchedPropertiesCache.clearViewportDependent();
 }
 
 void StyleResolver::applyMatchedProperties(StyleResolverState& state,
                                            const MatchResult& matchResult) {
   const Element* element = state.element();
   ASSERT(element);
 
   INCREMENT_STYLE_STATS_COUNTER(document().styleEngine(), matchedPropertyApply,
                                 1);
@@ skipping 246 matching lines @@
   }
   return false;
 }
 
 DEFINE_TRACE(StyleResolver) {
   visitor->trace(m_matchedPropertiesCache);
   visitor->trace(m_medium);
   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);
   visitor->trace(m_watchedSelectorsRules);
   visitor->trace(m_treeBoundaryCrossingScopes);
   visitor->trace(m_styleSharingLists);
   visitor->trace(m_pendingStyleSheets);
   visitor->trace(m_document);
 }
 
 }  // namespace blink