| Index: Source/core/css/MediaValues.cpp
|
| diff --git a/Source/core/css/MediaValues.cpp b/Source/core/css/MediaValues.cpp
|
| index a2d5e1b63c64f345ba04cb0fd978b99c826e3904..4de16eece9c7486cbf39f9bd83d771039f35a607 100644
|
| --- a/Source/core/css/MediaValues.cpp
|
| +++ b/Source/core/css/MediaValues.cpp
|
| @@ -96,23 +96,10 @@ 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
|
|
|