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

Side by Side Diff: Source/modules/battery/NavigatorBattery.cpp

Issue 1101263003: Oilpan: have Navigator and its supplements be on the heap by default. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/battery/NavigatorBattery.h ('k') | Source/modules/beacon/NavigatorBeacon.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/battery/NavigatorBattery.h" 6 #include "modules/battery/NavigatorBattery.h"
7 7
8 #include "core/frame/LocalFrame.h" 8 #include "core/frame/LocalFrame.h"
9 #include "modules/battery/BatteryManager.h" 9 #include "modules/battery/BatteryManager.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 NavigatorBattery::NavigatorBattery() 13 NavigatorBattery::NavigatorBattery()
14 { 14 {
15 } 15 }
16 16
17 NavigatorBattery::~NavigatorBattery()
18 {
19 }
20
21 ScriptPromise NavigatorBattery::getBattery(ScriptState* scriptState, Navigator& navigator) 17 ScriptPromise NavigatorBattery::getBattery(ScriptState* scriptState, Navigator& navigator)
22 { 18 {
23 return NavigatorBattery::from(navigator).getBattery(scriptState); 19 return NavigatorBattery::from(navigator).getBattery(scriptState);
24 } 20 }
25 21
26 ScriptPromise NavigatorBattery::getBattery(ScriptState* scriptState) 22 ScriptPromise NavigatorBattery::getBattery(ScriptState* scriptState)
27 { 23 {
28 if (!m_batteryManager) 24 if (!m_batteryManager)
29 m_batteryManager = BatteryManager::create(scriptState->executionContext( )); 25 m_batteryManager = BatteryManager::create(scriptState->executionContext( ));
30 26
31 return m_batteryManager->startRequest(scriptState); 27 return m_batteryManager->startRequest(scriptState);
32 } 28 }
33 29
34 const char* NavigatorBattery::supplementName() 30 const char* NavigatorBattery::supplementName()
35 { 31 {
36 return "NavigatorBattery"; 32 return "NavigatorBattery";
37 } 33 }
38 34
39 NavigatorBattery& NavigatorBattery::from(Navigator& navigator) 35 NavigatorBattery& NavigatorBattery::from(Navigator& navigator)
40 { 36 {
41 NavigatorBattery* supplement = static_cast<NavigatorBattery*>(WillBeHeapSupp lement<Navigator>::from(navigator, supplementName())); 37 NavigatorBattery* supplement = static_cast<NavigatorBattery*>(HeapSupplement <Navigator>::from(navigator, supplementName()));
42 if (!supplement) { 38 if (!supplement) {
43 supplement = new NavigatorBattery(); 39 supplement = new NavigatorBattery();
44 provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement)); 40 provideTo(navigator, supplementName(), supplement);
45 } 41 }
46 return *supplement; 42 return *supplement;
47 } 43 }
48 44
49 DEFINE_TRACE(NavigatorBattery) 45 DEFINE_TRACE(NavigatorBattery)
50 { 46 {
51 visitor->trace(m_batteryManager); 47 visitor->trace(m_batteryManager);
52 WillBeHeapSupplement<Navigator>::trace(visitor); 48 HeapSupplement<Navigator>::trace(visitor);
53 } 49 }
54 50
55 } // namespace blink 51 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/battery/NavigatorBattery.h ('k') | Source/modules/beacon/NavigatorBeacon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698