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

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

Issue 619383002: Move PlatformEventDispatcher implementations to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix non-Oilpan allocation of DeviceLightDispatcher singleton Created 6 years, 2 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/battery/BatteryManager.h" 6 #include "modules/battery/BatteryManager.h"
7 7
8 #include "core/dom/Document.h" 8 #include "core/dom/Document.h"
9 #include "core/events/Event.h" 9 #include "core/events/Event.h"
10 #include "modules/battery/BatteryDispatcher.h" 10 #include "modules/battery/BatteryDispatcher.h"
11 #include "modules/battery/BatteryStatus.h" 11 #include "modules/battery/BatteryStatus.h"
12 #include "platform/RuntimeEnabledFeatures.h" 12 #include "platform/RuntimeEnabledFeatures.h"
13 13
14 namespace blink { 14 namespace blink {
15 15
16 BatteryManager* BatteryManager::create(ExecutionContext* context) 16 BatteryManager* BatteryManager::create(ExecutionContext* context)
17 { 17 {
18 BatteryManager* batteryManager = new BatteryManager(context); 18 BatteryManager* batteryManager = new BatteryManager(context);
19 batteryManager->suspendIfNeeded(); 19 batteryManager->suspendIfNeeded();
20 return batteryManager; 20 return batteryManager;
21 } 21 }
22 22
23 BatteryManager::~BatteryManager() 23 BatteryManager::~BatteryManager()
24 { 24 {
25 #if !ENABLE(OILPAN)
25 stopUpdating(); 26 stopUpdating();
27 #endif
26 } 28 }
27 29
28 BatteryManager::BatteryManager(ExecutionContext* context) 30 BatteryManager::BatteryManager(ExecutionContext* context)
29 : ActiveDOMObject(context) 31 : ActiveDOMObject(context)
30 , PlatformEventController(toDocument(context)->page()) 32 , PlatformEventController(toDocument(context)->page())
31 , m_batteryStatus(BatteryStatus::create()) 33 , m_batteryStatus(BatteryStatus::create())
32 , m_state(NotStarted) 34 , m_state(NotStarted)
33 { 35 {
34 } 36 }
35 37
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 } 152 }
151 153
152 void BatteryManager::trace(Visitor* visitor) 154 void BatteryManager::trace(Visitor* visitor)
153 { 155 {
154 visitor->trace(m_batteryStatus); 156 visitor->trace(m_batteryStatus);
155 PlatformEventController::trace(visitor); 157 PlatformEventController::trace(visitor);
156 EventTargetWithInlineData::trace(visitor); 158 EventTargetWithInlineData::trace(visitor);
157 } 159 }
158 160
159 } // namespace blink 161 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/battery/BatteryManager.h ('k') | Source/modules/device_light/DeviceLightController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698