| Index: Source/core/css/MediaValues.cpp
|
| diff --git a/Source/core/css/MediaValues.cpp b/Source/core/css/MediaValues.cpp
|
| index b0b6a80b4cba943b28d1157e8e615c0a73b28f3c..a2d5e1b63c64f345ba04cb0fd978b99c826e3904 100644
|
| --- a/Source/core/css/MediaValues.cpp
|
| +++ b/Source/core/css/MediaValues.cpp
|
| @@ -76,7 +76,8 @@ float MediaValues::calculateDevicePixelRatio(LocalFrame* frame) const
|
| int MediaValues::calculateColorBitsPerComponent(LocalFrame* frame) const
|
| {
|
| ASSERT(frame && frame->page() && frame->page()->mainFrame());
|
| - if (screenIsMonochrome(frame->page()->mainFrame()->view()))
|
| + if (!frame->page()->mainFrame()->isLocalFrame()
|
| + || screenIsMonochrome(frame->page()->deprecatedLocalMainFrame()->view()))
|
| return 0;
|
| return screenDepthPerComponent(frame->view());
|
| }
|
| @@ -84,9 +85,10 @@ int MediaValues::calculateColorBitsPerComponent(LocalFrame* frame) const
|
| int MediaValues::calculateMonochromeBitsPerComponent(LocalFrame* frame) const
|
| {
|
| ASSERT(frame && frame->page() && frame->page()->mainFrame());
|
| - if (screenIsMonochrome(frame->page()->mainFrame()->view()))
|
| - return screenDepthPerComponent(frame->view());
|
| - return 0;
|
| + if (!frame->page()->mainFrame()->isLocalFrame()
|
| + || !screenIsMonochrome(frame->page()->deprecatedLocalMainFrame()->view()))
|
| + return 0;
|
| + return screenDepthPerComponent(frame->view());
|
| }
|
|
|
| int MediaValues::calculateDefaultFontSize(LocalFrame* frame) const
|
|
|