Move code from StyleResolver to ViewportStyleResolver.

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/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 199 matching lines @@
         appendCSSStyleSheet(*styleSheet);
 }
 
 void StyleResolver::finishAppendAuthorStyleSheets()
 {
     collectFeatures();
 
     if (document().layoutView() && document().layoutView()->style())
         document().layoutView()->style()->font().update(document().styleEngine().fontSelector());
 
-    collectViewportRules();
+    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;
 }
 
 void StyleResolver::addTreeBoundaryCrossingScope(ContainerNode& scope)
 {
     m_treeBoundaryCrossingRules.addScope(scope);
 }
 
 void StyleResolver::resetAuthorStyle(TreeScope& treeScope)
 {
     m_treeBoundaryCrossingRules.removeScope(treeScope.rootNode());
     resetRuleFeatures();
 
     ScopedStyleResolver* resolver = treeScope.scopedStyleResolver();
     if (!resolver)
         return;
 
-    resolver->resetAuthorStyle();
-    if (treeScope.rootNode().isDocumentNode())
+    if (treeScope.rootNode().isDocumentNode()) {
+        resolver->resetAuthorStyle();
         return;
+    }
 
     // resolver is going to be freed below.
     treeScope.clearScopedStyleResolver();
 }
 
 static PassOwnPtrWillBeRawPtr<RuleSet> makeRuleSet(const WillBeHeapVector<RuleFeature>& rules)
 {
     size_t size = rules.size();
     if (!size)
         return nullptr;
@@ skipping 617 matching lines @@
     applyMatchedProperties<LowPropertyPriority>(state, result, false, 0, result.matchedProperties.size() - 1, inheritedOnly);
 
     loadPendingResources(state);
 
     didAccess();
 
     // Now return the style.
     return state.takeStyle();
 }
 
-void StyleResolver::collectViewportRules()
-{
-    CSSDefaultStyleSheets& defaultStyleSheets = CSSDefaultStyleSheets::instance();
-    viewportStyleResolver()->collectViewportRules(defaultStyleSheets.defaultStyle(), ViewportStyleResolver::UserAgentOrigin);
-
-    if (!InspectorInstrumentation::applyViewportStyleOverride(&document(), this))
-        viewportStyleResolver()->collectViewportRules(defaultStyleSheets.defaultViewportStyle(), ViewportStyleResolver::UserAgentOrigin);
-
-    if (document().isMobileDocument())
-        viewportStyleResolver()->collectViewportRules(defaultStyleSheets.defaultXHTMLMobileProfileStyle(), ViewportStyleResolver::UserAgentOrigin);
-
-    if (ScopedStyleResolver* scopedResolver = document().scopedStyleResolver())
-        scopedResolver->collectViewportRulesTo(this);
-
-    viewportStyleResolver()->resolve();
-}
-
 PassRefPtr<LayoutStyle> StyleResolver::defaultStyleForElement()
 {
     RefPtr<LayoutStyle> style = LayoutStyle::create();
     FontBuilder fontBuilder(document());
     fontBuilder.setInitial(style->effectiveZoom());
     fontBuilder.createFont(document().styleEngine().fontSelector(), *style);
     return style.release();
 }
 
 PassRefPtr<LayoutStyle> StyleResolver::styleForText(Text* textNode)
@@ skipping 398 matching lines @@
     return StringHasher::hashMemory(properties, sizeof(MatchedProperties) * size);
 }
 
 void StyleResolver::invalidateMatchedPropertiesCache()
 {
     m_matchedPropertiesCache.clear();
 }
 
 void StyleResolver::notifyResizeForViewportUnits()
 {
-    collectViewportRules();
+    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(*this, matchedPropertyApply);
 
@@ skipping 181 matching lines @@
     visitor->trace(m_uncommonAttributeRuleSet);
     visitor->trace(m_watchedSelectorsRules);
     visitor->trace(m_treeBoundaryCrossingRules);
     visitor->trace(m_styleSharingLists);
     visitor->trace(m_pendingStyleSheets);
     visitor->trace(m_document);
 #endif
 }
 
 } // namespace blink