| OLD | NEW |
| 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 25 matching lines...) Expand all Loading... |
| 36 #include "core/frame/Settings.h" | 36 #include "core/frame/Settings.h" |
| 37 #include "core/inspector/InspectorInstrumentation.h" | 37 #include "core/inspector/InspectorInstrumentation.h" |
| 38 #include "platform/PlatformScreen.h" | 38 #include "platform/PlatformScreen.h" |
| 39 #include "platform/geometry/FloatRect.h" | 39 #include "platform/geometry/FloatRect.h" |
| 40 | 40 |
| 41 namespace blink { | 41 namespace blink { |
| 42 | 42 |
| 43 Screen::Screen(LocalFrame* frame) | 43 Screen::Screen(LocalFrame* frame) |
| 44 : DOMWindowProperty(frame) | 44 : DOMWindowProperty(frame) |
| 45 { | 45 { |
| 46 ScriptWrappable::init(this); | |
| 47 } | 46 } |
| 48 | 47 |
| 49 unsigned Screen::height() const | 48 unsigned Screen::height() const |
| 50 { | 49 { |
| 51 if (!m_frame) | 50 if (!m_frame) |
| 52 return 0; | 51 return 0; |
| 53 FrameHost* host = m_frame->host(); | 52 FrameHost* host = m_frame->host(); |
| 54 if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk()) | 53 if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk()) |
| 55 return lroundf(screenRect(m_frame->view()).height() * host->deviceScaleF
actor()); | 54 return lroundf(screenRect(m_frame->view()).height() * host->deviceScaleF
actor()); |
| 56 return static_cast<unsigned>(screenRect(m_frame->view()).height()); | 55 return static_cast<unsigned>(screenRect(m_frame->view()).height()); |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 return lroundf(screenAvailableRect(m_frame->view()).width() * host->devi
ceScaleFactor()); | 118 return lroundf(screenAvailableRect(m_frame->view()).width() * host->devi
ceScaleFactor()); |
| 120 return static_cast<unsigned>(screenAvailableRect(m_frame->view()).width()); | 119 return static_cast<unsigned>(screenAvailableRect(m_frame->view()).width()); |
| 121 } | 120 } |
| 122 | 121 |
| 123 void Screen::trace(Visitor* visitor) | 122 void Screen::trace(Visitor* visitor) |
| 124 { | 123 { |
| 125 WillBeHeapSupplementable<Screen>::trace(visitor); | 124 WillBeHeapSupplementable<Screen>::trace(visitor); |
| 126 } | 125 } |
| 127 | 126 |
| 128 } // namespace blink | 127 } // namespace blink |
| OLD | NEW |