MediaValuesInitialViewport passed to MediaQueryEvaluator as bool.

third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp

 /*
  * CSS Media Query Evaluator
  *
  * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  * Copyright (C) 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:
@@ skipping 21 matching lines @@
 #include "core/CSSValueKeywords.h"
 #include "core/MediaFeatureNames.h"
 #include "core/MediaFeatures.h"
 #include "core/MediaTypeNames.h"
 #include "core/css/CSSHelper.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSToLengthConversionData.h"
 #include "core/css/MediaList.h"
 #include "core/css/MediaQuery.h"
 #include "core/css/MediaValuesDynamic.h"
+#include "core/css/MediaValuesInitialViewport.h"
 #include "core/css/resolver/MediaQueryResult.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/RuntimeEnabledFeatures.h"
@@ skipping 15 matching lines @@
 static FunctionMap* gFunctionMap;
 
 MediaQueryEvaluator::MediaQueryEvaluator(bool mediaFeatureResult)
     : m_expectedResult(mediaFeatureResult) {}
 
 MediaQueryEvaluator::MediaQueryEvaluator(const char* acceptedMediaType,
                                          bool mediaFeatureResult)
     : m_mediaType(acceptedMediaType), m_expectedResult(mediaFeatureResult) {}
 
 MediaQueryEvaluator::MediaQueryEvaluator(LocalFrame* frame)
-    // Doesn't matter when we have m_frame and m_style.
-    : m_expectedResult(false),
-      m_mediaValues(MediaValues::createDynamicIfFrameExists(frame)) {}
+    : m_mediaValues(MediaValues::createDynamicIfFrameExists(frame)) {}
 
 MediaQueryEvaluator::MediaQueryEvaluator(const MediaValues& mediaValues)
-    : m_expectedResult(false),  // Doesn't matter when we have mediaValues.
-      m_mediaValues(mediaValues.copy()) {}
+    : m_mediaValues(mediaValues.copy()) {}
+
+MediaQueryEvaluator::MediaQueryEvaluator(
+    MediaValuesInitialViewport* mediaValues)
+    : m_mediaValues(mediaValues) {
+  DCHECK(mediaValues);
+}
 
 MediaQueryEvaluator::~MediaQueryEvaluator() {}
 
 DEFINE_TRACE(MediaQueryEvaluator) {
   visitor->trace(m_mediaValues);
 }
 
 const String MediaQueryEvaluator::mediaType() const {
   // If a static mediaType was given by the constructor, we use it here.
   if (!m_mediaType.isEmpty())
@@ skipping 654 matching lines @@
   // Call the media feature evaluation function. Assume no prefix and let
   // trampoline functions override the prefix if prefix is used.
   EvalFunc func = gFunctionMap->get(expr->mediaFeature().impl());
   if (func)
     return func(expr->expValue(), NoPrefix, *m_mediaValues);
 
   return false;
 }
 
 }  // namespace blink