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

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

Issue 688993002: Oilpan: have Screen be on the heap by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: non-oilpan compile fix Created 5 years, 8 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
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 if (!m_frame) 113 if (!m_frame)
114 return 0; 114 return 0;
115 FrameHost* host = m_frame->host(); 115 FrameHost* host = m_frame->host();
116 if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk()) 116 if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk())
117 return lroundf(screenAvailableRect(m_frame->view()).width() * host->devi ceScaleFactor()); 117 return lroundf(screenAvailableRect(m_frame->view()).width() * host->devi ceScaleFactor());
118 return static_cast<unsigned>(screenAvailableRect(m_frame->view()).width()); 118 return static_cast<unsigned>(screenAvailableRect(m_frame->view()).width());
119 } 119 }
120 120
121 DEFINE_TRACE(Screen) 121 DEFINE_TRACE(Screen)
122 { 122 {
123 #if ENABLE(OILPAN)
124 HeapSupplementable<Screen>::trace(visitor); 123 HeapSupplementable<Screen>::trace(visitor);
125 #endif
126 DOMWindowProperty::trace(visitor); 124 DOMWindowProperty::trace(visitor);
127 } 125 }
128 126
129 } // namespace blink 127 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698