MediaQueryEvaluator getting mediaType from MediaValues

Source/core/css/MediaValues.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/MediaValues.h"
 
 #include "core/css/CSSHelper.h"
 #include "core/css/MediaValuesCached.h"
 #include "core/css/MediaValuesDynamic.h"
@@ skipping 78 matching lines @@
         || !screenIsMonochrome(frame->page()->deprecatedLocalMainFrame()->view()))
         return 0;
     return screenDepthPerComponent(frame->view());
 }
 
 int MediaValues::calculateDefaultFontSize(LocalFrame* frame) const
 {
     return frame->host()->settings().defaultFontSize();
 }
 
-bool MediaValues::calculateScanMediaType(LocalFrame* frame) const
+const String MediaValues::calculateMediaType(LocalFrame* frame) const
 {
     ASSERT(frame && frame->view());
-    // Scan only applies to 'tv' media.
-    return equalIgnoringCase(frame->view()->mediaType(), "tv");
-}
-
-bool MediaValues::calculateScreenMediaType(LocalFrame* frame) const
-{
-    ASSERT(frame && frame->view());
-    return equalIgnoringCase(frame->view()->mediaType(), "screen");
-}
-
-bool MediaValues::calculatePrintMediaType(LocalFrame* frame) const
-{
-    ASSERT(frame && frame->view());
-    return equalIgnoringCase(frame->view()->mediaType(), "print");
+    return frame->view()->mediaType();
 }
 
 bool MediaValues::calculateThreeDEnabled(LocalFrame* frame) const
 {
     ASSERT(frame && frame->contentRenderer() && frame->contentRenderer()->compositor());
     bool threeDEnabled = false;
     if (RenderView* view = frame->contentRenderer())
         threeDEnabled = view->compositor()->hasAcceleratedCompositing();
     return threeDEnabled;
 }
@@ skipping 71 matching lines @@
     default:
         return false;
     }
 
     ASSERT(factor > 0);
     result = value * factor;
     return true;
 }
 
 } // namespace