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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/FrameView.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/css/MediaValues.h" 5 #include "core/css/MediaValues.h"
6 6
7 #include "core/css/CSSHelper.h" 7 #include "core/css/CSSHelper.h"
8 #include "core/css/MediaValuesCached.h" 8 #include "core/css/MediaValuesCached.h"
9 #include "core/css/MediaValuesDynamic.h" 9 #include "core/css/MediaValuesDynamic.h"
10 #include "core/dom/Document.h" 10 #include "core/dom/Document.h"
(...skipping 14 matching lines...) Expand all
25 namespace blink { 25 namespace blink {
26 26
27 MediaValues* MediaValues::createDynamicIfFrameExists(LocalFrame* frame) { 27 MediaValues* MediaValues::createDynamicIfFrameExists(LocalFrame* frame) {
28 if (frame) 28 if (frame)
29 return MediaValuesDynamic::create(frame); 29 return MediaValuesDynamic::create(frame);
30 return MediaValuesCached::create(); 30 return MediaValuesCached::create();
31 } 31 }
32 32
33 double MediaValues::calculateViewportWidth(LocalFrame* frame) { 33 double MediaValues::calculateViewportWidth(LocalFrame* frame) {
34 ASSERT(frame && frame->view() && frame->document()); 34 ASSERT(frame && frame->view() && frame->document());
35 int viewportWidth = frame->view()->layoutSize(IncludeScrollbars).width(); 35 return frame->view()->viewportSizeForMediaQueries().width();
36 return adjustDoubleForAbsoluteZoom(
37 viewportWidth, frame->document()->layoutViewItem().styleRef());
38 } 36 }
39 37
40 double MediaValues::calculateViewportHeight(LocalFrame* frame) { 38 double MediaValues::calculateViewportHeight(LocalFrame* frame) {
41 ASSERT(frame && frame->view() && frame->document()); 39 ASSERT(frame && frame->view() && frame->document());
42 int viewportHeight = frame->view()->layoutSize(IncludeScrollbars).height(); 40 return frame->view()->viewportSizeForMediaQueries().height();
43 return adjustDoubleForAbsoluteZoom(
44 viewportHeight, frame->document()->layoutViewItem().styleRef());
45 } 41 }
46 42
47 int MediaValues::calculateDeviceWidth(LocalFrame* frame) { 43 int MediaValues::calculateDeviceWidth(LocalFrame* frame) {
48 DCHECK(frame && frame->view() && frame->settings() && frame->page()); 44 DCHECK(frame && frame->view() && frame->settings() && frame->page());
49 blink::WebScreenInfo screenInfo = frame->page()->chromeClient().screenInfo(); 45 blink::WebScreenInfo screenInfo = frame->page()->chromeClient().screenInfo();
50 int deviceWidth = screenInfo.rect.width; 46 int deviceWidth = screenInfo.rect.width;
51 if (frame->settings()->getReportScreenSizeInPhysicalPixelsQuirk()) 47 if (frame->settings()->getReportScreenSizeInPhysicalPixelsQuirk())
52 deviceWidth = lroundf(deviceWidth * screenInfo.deviceScaleFactor); 48 deviceWidth = lroundf(deviceWidth * screenInfo.deviceScaleFactor);
53 return deviceWidth; 49 return deviceWidth;
54 } 50 }
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 212
217 LocalFrame* MediaValues::frameFrom(Document& document) { 213 LocalFrame* MediaValues::frameFrom(Document& document) {
218 Document* executingDocument = document.importsController() 214 Document* executingDocument = document.importsController()
219 ? document.importsController()->master() 215 ? document.importsController()->master()
220 : &document; 216 : &document;
221 ASSERT(executingDocument); 217 ASSERT(executingDocument);
222 return executingDocument->frame(); 218 return executingDocument->frame();
223 } 219 }
224 220
225 } // namespace blink 221 } // namespace blink
OLDNEW
« 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