Implement MediaValues for initial viewport.

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 15 matching lines @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include "core/css/resolver/ViewportStyleResolver.h"
 
 #include "core/CSSValueKeywords.h"
 #include "core/css/CSSDefaultStyleSheets.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSToLengthConversionData.h"
-#include "core/css/MediaValuesDynamic.h"
+#include "core/css/MediaValuesInitialViewport.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/resolver/ScopedStyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/dom/ViewportDescription.h"
 #include "core/frame/Settings.h"
 #include "core/layout/api/LayoutViewItem.h"
 
 namespace blink {
 
 ViewportStyleResolver::ViewportStyleResolver(Document& document)
     : m_document(document), m_hasAuthorStyle(false) {
   DCHECK(document.frame());
-  // TODO(rune@opera.com): The MediaValues object passed here should reflect the
-  // initial viewport, not the actual viewport. See https://crbug.com/332763
-  m_initialViewportMedium =
-      new MediaQueryEvaluator(MediaValuesDynamic::create(document.frame()));
+  m_initialViewportMedium = new MediaQueryEvaluator(
+      MediaValuesInitialViewport::create(*document.frame()));
 }
 
 void ViewportStyleResolver::collectViewportRulesFromUASheets() {
   CSSDefaultStyleSheets& defaultStyleSheets = CSSDefaultStyleSheets::instance();
   WebViewportStyle viewportStyle = m_document->settings()
                                        ? m_document->settings()->viewportStyle()
                                        : WebViewportStyle::Default;
   StyleSheetContents* viewportContents = nullptr;
   switch (viewportStyle) {
     case WebViewportStyle::Default:
@@ skipping 199 matching lines @@
   return result;
 }
 
 DEFINE_TRACE(ViewportStyleResolver) {
   visitor->trace(m_document);
   visitor->trace(m_propertySet);
   visitor->trace(m_initialViewportMedium);
 }
 
 }  // namespace blink