Source/core/css/MediaValues.cpp - Issue 336553003: Change Page::m_mainFrame to be a Frame.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/css/MediaValues.cpp

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Rebased Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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

« no previous file with comments | « Source/bindings/v8/PageScriptDebugServer.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »