MediaQueryEvaluator getting mediaType from MediaValues

Source/core/css/MediaValuesCached.h

Index: Source/core/css/MediaValuesCached.h
diff --git a/Source/core/css/MediaValuesCached.h b/Source/core/css/MediaValuesCached.h
index c3ff031c884202c6f6cbae543834d0c61f06b2b8..f0accf3946b331aaee1b658f131a1987b99216ba 100644
--- a/Source/core/css/MediaValuesCached.h
+++ b/Source/core/css/MediaValuesCached.h
@@ -23,10 +23,8 @@ public:
         PointerDeviceType pointer;
         int defaultFontSize;
         bool threeDEnabled;
-        bool scanMediaType;
-        bool screenMediaType;
-        bool printMediaType;
         bool strictMode;
+        String mediaType;
 
         MediaValuesCachedData()
             : viewportWidth(0)
@@ -39,9 +37,6 @@ public:
             , pointer(UnknownPointer)
             , defaultFontSize(16)
             , threeDEnabled(false)
-            , scanMediaType(false)
-            , screenMediaType(true)
-            , printMediaType(false)
             , strictMode(true)
         {
         }
@@ -65,12 +60,10 @@ public:
     virtual int monochromeBitsPerComponent() const OVERRIDE;
     virtual PointerDeviceType pointer() const OVERRIDE;
     virtual bool threeDEnabled() const OVERRIDE;
-    virtual bool scanMediaType() const OVERRIDE;
-    virtual bool screenMediaType() const OVERRIDE;
-    virtual bool printMediaType() const OVERRIDE;
     virtual bool strictMode() const OVERRIDE;
     virtual Document* document() const OVERRIDE;
     virtual bool hasValues() const OVERRIDE;
+    virtual const String mediaType() const OVERRIDE;
 
 protected:
     MediaValuesCached();