Source/core/page/DOMWindow.cpp - Issue 23192002: Let page zoom affect resolution and -webkit-device-pixel-ratio MQs.

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/page/DOMWindow.cpp

Issue 23192002: Let page zoom affect resolution and -webkit-device-pixel-ratio MQs. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Review issue: renamed variable Created 7 years, 4 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:

View side-by-side diff with in-line comments

Download patch

Index: Source/core/page/DOMWindow.cpp

diff --git a/Source/core/page/DOMWindow.cpp b/Source/core/page/DOMWindow.cpp

index f45e8dfa3cf44f01479d5cdc23cc89e52796bd24..6d15a99982a2d686237b380ca6ee1a54cf0dd74f 100644

--- a/Source/core/page/DOMWindow.cpp

+++ b/Source/core/page/DOMWindow.cpp

@@ -1254,14 +1254,7 @@ double DOMWindow::devicePixelRatio() const

if (!m_frame)

return 0.0;

- Page* page = m_frame->page();

- if (!page)

- return 0.0;

- if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled())

- return page->deviceScaleFactor() * m_frame->pageZoomFactor();

- return page->deviceScaleFactor();

+ return m_frame->devicePixelRatio();

}

void DOMWindow::scrollBy(int x, int y) const

« no previous file with comments | « Source/core/css/MediaQueryEvaluator.cpp ('k') | Source/core/page/Frame.h » ('j') | no next file with comments »