Revert of Create MediaValuesCached and TokenPreloadScanner on the parser thread

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

Index: third_party/WebKit/Source/core/css/MediaValues.cpp
diff --git a/third_party/WebKit/Source/core/css/MediaValues.cpp b/third_party/WebKit/Source/core/css/MediaValues.cpp
index 68364f6dc5db4c776807d14f8dff82dc20facb94..661e914a220e3522ea692404386314a486272b32 100644
--- a/third_party/WebKit/Source/core/css/MediaValues.cpp
+++ b/third_party/WebKit/Source/core/css/MediaValues.cpp
@@ -31,21 +31,21 @@
     return MediaValuesCached::create();
 }
 
-double MediaValues::calculateViewportWidth(LocalFrame* frame)
+double MediaValues::calculateViewportWidth(LocalFrame* frame) const
 {
     ASSERT(frame && frame->view() && frame->document());
     int viewportWidth = frame->view()->layoutSize(IncludeScrollbars).width();
     return adjustDoubleForAbsoluteZoom(viewportWidth, *frame->document()->layoutView());
 }
 
-double MediaValues::calculateViewportHeight(LocalFrame* frame)
+double MediaValues::calculateViewportHeight(LocalFrame* frame) const
 {
     ASSERT(frame && frame->view() && frame->document());
     int viewportHeight = frame->view()->layoutSize(IncludeScrollbars).height();
     return adjustDoubleForAbsoluteZoom(viewportHeight, *frame->document()->layoutView());
 }
 
-int MediaValues::calculateDeviceWidth(LocalFrame* frame)
+int MediaValues::calculateDeviceWidth(LocalFrame* frame) const
 {
     ASSERT(frame && frame->view() && frame->settings() && frame->host());
     int deviceWidth = frame->host()->chromeClient().screenInfo().rect.width;
@@ -54,7 +54,7 @@
     return deviceWidth;
 }
 
-int MediaValues::calculateDeviceHeight(LocalFrame* frame)
+int MediaValues::calculateDeviceHeight(LocalFrame* frame) const
 {
     ASSERT(frame && frame->view() && frame->settings() && frame->host());
     int deviceHeight = frame->host()->chromeClient().screenInfo().rect.height;
@@ -63,18 +63,18 @@
     return deviceHeight;
 }
 
-bool MediaValues::calculateStrictMode(LocalFrame* frame)
+bool MediaValues::calculateStrictMode(LocalFrame* frame) const
 {
     ASSERT(frame && frame->document());
     return !frame->document()->inQuirksMode();
 }
 
-float MediaValues::calculateDevicePixelRatio(LocalFrame* frame)
+float MediaValues::calculateDevicePixelRatio(LocalFrame* frame) const
 {
     return frame->devicePixelRatio();
 }
 
-int MediaValues::calculateColorBitsPerComponent(LocalFrame* frame)
+int MediaValues::calculateColorBitsPerComponent(LocalFrame* frame) const
 {
     ASSERT(frame && frame->page() && frame->page()->mainFrame());
     if (!frame->page()->mainFrame()->isLocalFrame()
@@ -83,7 +83,7 @@
     return frame->host()->chromeClient().screenInfo().depthPerComponent;
 }
 
-int MediaValues::calculateMonochromeBitsPerComponent(LocalFrame* frame)
+int MediaValues::calculateMonochromeBitsPerComponent(LocalFrame* frame) const
 {
     ASSERT(frame && frame->page() && frame->page()->mainFrame());
     if (!frame->page()->mainFrame()->isLocalFrame()
@@ -92,12 +92,12 @@
     return frame->host()->chromeClient().screenInfo().depthPerComponent;
 }
 
-int MediaValues::calculateDefaultFontSize(LocalFrame* frame)
+int MediaValues::calculateDefaultFontSize(LocalFrame* frame) const
 {
     return frame->host()->settings().defaultFontSize();
 }
 
-const String MediaValues::calculateMediaType(LocalFrame* frame)
+const String MediaValues::calculateMediaType(LocalFrame* frame) const
 {
     ASSERT(frame);
     if (!frame->view())
@@ -105,7 +105,7 @@
     return frame->view()->mediaType();
 }
 
-WebDisplayMode MediaValues::calculateDisplayMode(LocalFrame* frame)
+WebDisplayMode MediaValues::calculateDisplayMode(LocalFrame* frame) const
 {
     ASSERT(frame);
     WebDisplayMode mode = frame->host()->settings().displayModeOverride();
@@ -119,7 +119,7 @@
     return frame->view()->displayMode();
 }
 
-bool MediaValues::calculateThreeDEnabled(LocalFrame* frame)
+bool MediaValues::calculateThreeDEnabled(LocalFrame* frame) const
 {
     ASSERT(frame && frame->contentLayoutObject() && frame->contentLayoutObject()->compositor());
     bool threeDEnabled = false;
@@ -128,25 +128,25 @@
     return threeDEnabled;
 }
 
-PointerType MediaValues::calculatePrimaryPointerType(LocalFrame* frame)
+PointerType MediaValues::calculatePrimaryPointerType(LocalFrame* frame) const
 {
     ASSERT(frame && frame->settings());
     return frame->settings()->primaryPointerType();
 }
 
-int MediaValues::calculateAvailablePointerTypes(LocalFrame* frame)
+int MediaValues::calculateAvailablePointerTypes(LocalFrame* frame) const
 {
     ASSERT(frame && frame->settings());
     return frame->settings()->availablePointerTypes();
 }
 
-HoverType MediaValues::calculatePrimaryHoverType(LocalFrame* frame)
+HoverType MediaValues::calculatePrimaryHoverType(LocalFrame* frame) const
 {
     ASSERT(frame && frame->settings());
     return frame->settings()->primaryHoverType();
 }
 
-int MediaValues::calculateAvailableHoverTypes(LocalFrame* frame)
+int MediaValues::calculateAvailableHoverTypes(LocalFrame* frame) const
 {
     ASSERT(frame && frame->settings());
     return frame->settings()->availableHoverTypes();