MediaQueryEvaluator getting mediaType from MediaValues

Source/core/css/MediaValuesCached.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/MediaValuesCached.h"
 
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 42 matching lines @@
     m_data.viewportWidth = calculateViewportWidth(frame);
     m_data.viewportHeight = calculateViewportHeight(frame);
     m_data.deviceWidth = calculateDeviceWidth(frame);
     m_data.deviceHeight = calculateDeviceHeight(frame);
     m_data.devicePixelRatio = calculateDevicePixelRatio(frame);
     m_data.colorBitsPerComponent = calculateColorBitsPerComponent(frame);
     m_data.monochromeBitsPerComponent = calculateMonochromeBitsPerComponent(frame);
     m_data.pointer = calculateLeastCapablePrimaryPointerDeviceType(frame);
     m_data.defaultFontSize = calculateDefaultFontSize(frame);
     m_data.threeDEnabled = calculateThreeDEnabled(frame);
-    m_data.scanMediaType = calculateScanMediaType(frame);
-    m_data.screenMediaType = calculateScreenMediaType(frame);
-    m_data.printMediaType = calculatePrintMediaType(frame);
     m_data.strictMode = calculateStrictMode(frame);
+    const String mediaType = calculateMediaType(frame);
+    if (!mediaType.isEmpty())
+        m_data.mediaType = mediaType.isolatedCopy();
 }
 
 MediaValuesCached::MediaValuesCached(const MediaValuesCachedData& data)
     : m_data(data)
 {
 }
 
 PassRefPtr<MediaValues> MediaValuesCached::copy() const
 {
     return adoptRef(new MediaValuesCached(m_data));
@@ skipping 52 matching lines @@
 MediaValues::PointerDeviceType MediaValuesCached::pointer() const
 {
     return m_data.pointer;
 }
 
 bool MediaValuesCached::threeDEnabled() const
 {
     return m_data.threeDEnabled;
 }
 
-bool MediaValuesCached::scanMediaType() const
-{
-    return m_data.scanMediaType;
-}
-
-bool MediaValuesCached::screenMediaType() const
-{
-    return m_data.screenMediaType;
-}
-
-bool MediaValuesCached::printMediaType() const
-{
-    return m_data.printMediaType;
-}
-
 bool MediaValuesCached::strictMode() const
 {
     return m_data.strictMode;
 }
+const String MediaValuesCached::mediaType() const
+{
+    return m_data.mediaType;
+}
 
 Document* MediaValuesCached::document() const
 {
     return 0;
 }
 
 bool MediaValuesCached::hasValues() const
 {
     return true;
 }
 
 } // namespace