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

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

Issue 2738173002: Initial containing block for print not affected by page zoom. (Closed)
Patch Set: Missing IncludeScrollbars. Created 3 years, 9 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/FrameView.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/MediaValues.cpp
diff --git a/third_party/WebKit/Source/core/css/MediaValues.cpp b/third_party/WebKit/Source/core/css/MediaValues.cpp
index c35e2947008f95623fe44b683c5b502d28847eb7..5d6f585e92ea4bdcc3db2f190887a5f20f90cbe4 100644
--- a/third_party/WebKit/Source/core/css/MediaValues.cpp
+++ b/third_party/WebKit/Source/core/css/MediaValues.cpp
@@ -32,16 +32,12 @@ MediaValues* MediaValues::createDynamicIfFrameExists(LocalFrame* frame) {
double MediaValues::calculateViewportWidth(LocalFrame* frame) {
ASSERT(frame && frame->view() && frame->document());
- int viewportWidth = frame->view()->layoutSize(IncludeScrollbars).width();
- return adjustDoubleForAbsoluteZoom(
- viewportWidth, frame->document()->layoutViewItem().styleRef());
+ return frame->view()->viewportSizeForMediaQueries().width();
}
double MediaValues::calculateViewportHeight(LocalFrame* frame) {
ASSERT(frame && frame->view() && frame->document());
- int viewportHeight = frame->view()->layoutSize(IncludeScrollbars).height();
- return adjustDoubleForAbsoluteZoom(
- viewportHeight, frame->document()->layoutViewItem().styleRef());
+ return frame->view()->viewportSizeForMediaQueries().height();
}
int MediaValues::calculateDeviceWidth(LocalFrame* frame) {
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/FrameView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698