| 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 if (!m_frame) | 114 if (!m_frame) |
| 115 return 0; | 115 return 0; |
| 116 FrameHost* host = m_frame->host(); | 116 FrameHost* host = m_frame->host(); |
| 117 if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk()) | 117 if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk()) |
| 118 return lroundf(screenAvailableRect(m_frame->view()).width() * host->devi
ceScaleFactor()); | 118 return lroundf(screenAvailableRect(m_frame->view()).width() * host->devi
ceScaleFactor()); |
| 119 return static_cast<unsigned>(screenAvailableRect(m_frame->view()).width()); | 119 return static_cast<unsigned>(screenAvailableRect(m_frame->view()).width()); |
| 120 } | 120 } |
| 121 | 121 |
| 122 void Screen::trace(Visitor* visitor) | 122 void Screen::trace(Visitor* visitor) |
| 123 { | 123 { |
| 124 WillBeHeapSupplementable<Screen>::trace(visitor); | 124 #if ENABLE(OILPAN) |
| 125 HeapSupplementable<Screen>::trace(visitor); |
| 126 #endif |
| 125 DOMWindowProperty::trace(visitor); | 127 DOMWindowProperty::trace(visitor); |
| 126 } | 128 } |
| 127 | 129 |
| 128 } // namespace blink | 130 } // namespace blink |
| OLD | NEW |