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

Side by Side Diff: Source/core/frame/Screen.cpp

Issue 26848007: Move Navigation Timing and other various window-level objects out of page/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/Screen.h ('k') | Source/core/frame/Screen.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 10 matching lines...) Expand all
21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 29
30 #include "config.h" 30 #include "config.h"
31 #include "core/page/Screen.h" 31 #include "core/frame/Screen.h"
32 32
33 #include "core/inspector/InspectorInstrumentation.h" 33 #include "core/inspector/InspectorInstrumentation.h"
34 #include "core/page/Frame.h" 34 #include "core/page/Frame.h"
35 #include "core/page/FrameView.h" 35 #include "core/page/FrameView.h"
36 #include "core/page/Page.h" 36 #include "core/page/Page.h"
37 #include "core/page/Settings.h" 37 #include "core/page/Settings.h"
38 #include "core/platform/PlatformScreen.h" 38 #include "core/platform/PlatformScreen.h"
39 #include "platform/geometry/FloatRect.h" 39 #include "platform/geometry/FloatRect.h"
40 40
41 namespace WebCore { 41 namespace WebCore {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 { 114 {
115 if (!m_frame) 115 if (!m_frame)
116 return 0; 116 return 0;
117 Page* page = m_frame->page(); 117 Page* page = m_frame->page();
118 if (page && page->settings().reportScreenSizeInPhysicalPixelsQuirk()) 118 if (page && page->settings().reportScreenSizeInPhysicalPixelsQuirk())
119 return lroundf(screenAvailableRect(m_frame->view()).width() * page->devi ceScaleFactor()); 119 return lroundf(screenAvailableRect(m_frame->view()).width() * page->devi ceScaleFactor());
120 return static_cast<unsigned>(screenAvailableRect(m_frame->view()).width()); 120 return static_cast<unsigned>(screenAvailableRect(m_frame->view()).width());
121 } 121 }
122 122
123 } // namespace WebCore 123 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/Screen.h ('k') | Source/core/frame/Screen.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698