Collect @viewport before constructing RuleSets.

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

 /*
  * Copyright (C) 2012-2013 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 21 matching lines @@
 #include "core/CSSValueKeywords.h"
 #include "core/css/CSSDefaultStyleSheets.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/CSSToLengthConversionData.h"
 #include "core/css/MediaValuesInitialViewport.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
 #include "core/css/StyleRuleImport.h"
 #include "core/css/StyleSheetContents.h"
-#include "core/css/resolver/ScopedStyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentStyleSheetCollection.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/dom/ViewportDescription.h"
+#include "core/frame/FrameView.h"
+#include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/layout/api/LayoutViewItem.h"
 
 namespace blink {
 
 ViewportStyleResolver::ViewportStyleResolver(Document& document)
     : m_document(document) {
   DCHECK(document.frame());
   m_initialViewportMedium = new MediaQueryEvaluator(
       MediaValuesInitialViewport::create(*document.frame()));
@@ skipping 29 matching lines @@
     collectViewportChildRules(viewportContents->childRules(), UserAgentOrigin);
 
   if (m_document->isMobileDocument()) {
     collectViewportChildRules(
         defaultStyleSheets.ensureXHTMLMobileProfileStyleSheet()->childRules(),
         UserAgentOrigin);
   }
   DCHECK(!defaultStyleSheets.defaultStyleSheet()->hasViewportRule());
 }
 
-void ViewportStyleResolver::collectViewportRules() {
-  reset();
-  collectViewportRulesFromUASheets();
-  if (ScopedStyleResolver* scopedResolver = m_document->scopedStyleResolver())
-    scopedResolver->collectViewportRulesTo(this);
-
-  resolve();
-}
-
 void ViewportStyleResolver::collectViewportChildRules(
     const HeapVector<Member<StyleRuleBase>>& rules,
     Origin origin) {
   for (auto& rule : rules) {
     if (rule->isViewportRule()) {
       addViewportRule(*toStyleRuleViewport(rule), origin);
     } else if (rule->isMediaRule()) {
       StyleRuleMedia* mediaRule = toStyleRuleMedia(rule);
       if (!mediaRule->mediaQueries() ||
           m_initialViewportMedium->eval(mediaRule->mediaQueries(),
@@ skipping 37 matching lines @@
   if (!contents.hasViewportRule() && contents.importRules().isEmpty())
     return;
   if (sheet.mediaQueries() &&
       !m_initialViewportMedium->eval(sheet.mediaQueries(),
                                      &m_viewportDependentMediaQueryResults,
                                      &m_deviceDependentMediaQueryResults))
     return;
   collectViewportRulesFromAuthorSheetContents(contents);
 }
 
-void ViewportStyleResolver::collectViewportRules(RuleSet* rules,
-                                                 Origin origin) {
-  rules->compactRulesIfNeeded();
-
-  const HeapVector<Member<StyleRuleViewport>>& viewportRules =
-      rules->viewportRules();
-  for (size_t i = 0; i < viewportRules.size(); ++i)
-    addViewportRule(*viewportRules[i], origin);
-}
-
 void ViewportStyleResolver::addViewportRule(StyleRuleViewport& viewportRule,
                                             Origin origin) {
   StylePropertySet& propertySet = viewportRule.mutableProperties();
 
   unsigned propertyCount = propertySet.propertyCount();
   if (!propertyCount)
     return;
 
   if (origin == AuthorOrigin)
     m_hasAuthorStyle = true;
@@ skipping 109 matching lines @@
   }
 
   const CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
   ComputedStyle* documentStyle = m_document->mutableComputedStyle();
 
   // If we have viewport units the conversion will mark the document style as
   // having viewport units.
   bool documentStyleHasViewportUnits = documentStyle->hasViewportUnits();
   documentStyle->setHasViewportUnits(false);
 
+  FrameView* view = m_document->frame()->view();
+  DCHECK(view);
+
   CSSToLengthConversionData::FontSizes fontSizes(documentStyle, documentStyle);
   CSSToLengthConversionData::ViewportSize viewportSize(
-      m_document->layoutViewItem());
+      view->initialViewportWidth(), view->initialViewportHeight());
 
   Length result = primitiveValue->convertToLength(
       CSSToLengthConversionData(documentStyle, fontSizes, viewportSize, 1.0f));
-  if (documentStyle->hasViewportUnits()) {
-    // TODO (rune@opera.com): remove the setHasViewportUnit when
-    // initialViewportChanged() goes live.
-    m_document->setHasViewportUnits();
+  if (documentStyle->hasViewportUnits())
     m_hasViewportUnits = true;
-  }
   documentStyle->setHasViewportUnits(documentStyleHasViewportUnits);
 
   return result;
 }
 
 void ViewportStyleResolver::initialViewportChanged() {
   if (m_needsUpdate == CollectRules)
     return;
 
   auto& results = m_viewportDependentMediaQueryResults;
@@ skipping 28 matching lines @@
 
 DEFINE_TRACE(ViewportStyleResolver) {
   visitor->trace(m_document);
   visitor->trace(m_propertySet);
   visitor->trace(m_initialViewportMedium);
   visitor->trace(m_viewportDependentMediaQueryResults);
   visitor->trace(m_deviceDependentMediaQueryResults);
 }
 
 }  // namespace blink