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

Side by Side Diff: Source/modules/screen_orientation/ScreenScreenOrientation.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 // 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 "config.h" 5 #include "config.h"
6 #include "modules/screen_orientation/ScreenScreenOrientation.h" 6 #include "modules/screen_orientation/ScreenScreenOrientation.h"
7 7
8 #include "bindings/core/v8/ScriptState.h" 8 #include "bindings/core/v8/ScriptState.h"
9 #include "core/frame/Screen.h" 9 #include "core/frame/Screen.h"
10 #include "modules/screen_orientation/ScreenOrientation.h" 10 #include "modules/screen_orientation/ScreenOrientation.h"
11 11
12 namespace blink { 12 namespace blink {
13 13
14 // static 14 // static
15 ScreenScreenOrientation& ScreenScreenOrientation::from(Screen& screen) 15 ScreenScreenOrientation& ScreenScreenOrientation::from(Screen& screen)
16 { 16 {
17 ScreenScreenOrientation* supplement = static_cast<ScreenScreenOrientation*>( WillBeHeapSupplement<Screen>::from(screen, supplementName())); 17 ScreenScreenOrientation* supplement = static_cast<ScreenScreenOrientation*>( HeapSupplement<Screen>::from(screen, supplementName()));
18 if (!supplement) { 18 if (!supplement) {
19 supplement = new ScreenScreenOrientation(); 19 supplement = new ScreenScreenOrientation();
20 provideTo(screen, supplementName(), adoptPtrWillBeNoop(supplement)); 20 provideTo(screen, supplementName(), supplement);
21 } 21 }
22 return *supplement; 22 return *supplement;
23 } 23 }
24 24
25 ScreenScreenOrientation::~ScreenScreenOrientation()
26 {
27 }
28
29 // static 25 // static
30 ScreenOrientation* ScreenScreenOrientation::orientation(ScriptState* state, Scre en& screen) 26 ScreenOrientation* ScreenScreenOrientation::orientation(ScriptState* state, Scre en& screen)
31 { 27 {
32 ScreenScreenOrientation& self = ScreenScreenOrientation::from(screen); 28 ScreenScreenOrientation& self = ScreenScreenOrientation::from(screen);
33 if (!screen.frame()) 29 if (!screen.frame())
34 return 0; 30 return nullptr;
35 31
36 if (!self.m_orientation) 32 if (!self.m_orientation)
37 self.m_orientation = ScreenOrientation::create(screen.frame()); 33 self.m_orientation = ScreenOrientation::create(screen.frame());
38 34
39 return self.m_orientation.get(); 35 return self.m_orientation;
40 } 36 }
41 37
42 const char* ScreenScreenOrientation::supplementName() 38 const char* ScreenScreenOrientation::supplementName()
43 { 39 {
44 return "ScreenScreenOrientation"; 40 return "ScreenScreenOrientation";
45 } 41 }
46 42
47 DEFINE_TRACE(ScreenScreenOrientation) 43 DEFINE_TRACE(ScreenScreenOrientation)
48 { 44 {
49 visitor->trace(m_orientation); 45 visitor->trace(m_orientation);
50 WillBeHeapSupplement<Screen>::trace(visitor); 46 HeapSupplement<Screen>::trace(visitor);
51 } 47 }
52 48
53 } // namespace blink 49 } // namespace blink
OLDNEW
« Source/core/frame/Screen.h ('K') | « Source/modules/screen_orientation/ScreenScreenOrientation.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698