Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1341)

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: 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..9bb352ecccb1b69e3aac3ec186054fce087f9cbf 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->resolutionDPPX();
}
void DOMWindow::scrollBy(int x, int y) const

Powered by Google App Engine
This is Rietveld 408576698