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

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

Issue 315573002: Generalize and refactor DeviceSensorEvent* architecture to support multi-event type targets. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add stopUpdating in destructor of BatteryManager. Created 6 years, 6 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
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 "RuntimeEnabledFeatures.h" 8 #include "RuntimeEnabledFeatures.h"
9 #include "modules/battery/BatteryDispatcher.h" 9 #include "modules/battery/BatteryDispatcher.h"
10 #include "modules/battery/BatteryStatus.h" 10 #include "modules/battery/BatteryStatus.h"
11 #include <limits>
12 11
13 namespace WebCore { 12 namespace WebCore {
14 13
15 PassRefPtrWillBeRawPtr<BatteryManager> BatteryManager::create(ExecutionContext* context) 14 PassRefPtrWillBeRawPtr<BatteryManager> BatteryManager::create(ExecutionContext* context)
16 { 15 {
17 RefPtrWillBeRawPtr<BatteryManager> batteryManager(adoptRefWillBeRefCountedGa rbageCollected(new BatteryManager(context))); 16 RefPtrWillBeRawPtr<BatteryManager> batteryManager(adoptRefWillBeRefCountedGa rbageCollected(new BatteryManager(context)));
18 batteryManager->suspendIfNeeded(); 17 batteryManager->suspendIfNeeded();
19 return batteryManager.release(); 18 return batteryManager.release();
20 } 19 }
21 20
22 BatteryManager::~BatteryManager() 21 BatteryManager::~BatteryManager()
23 { 22 {
23 stopUpdating();
24 } 24 }
25 25
26 BatteryManager::BatteryManager(ExecutionContext* context) 26 BatteryManager::BatteryManager(ExecutionContext* context)
27 : ActiveDOMObject(context) 27 : ActiveDOMObject(context)
28 , DeviceSensorEventController(toDocument(context)->page()) 28 , DeviceEventControllerBase(toDocument(context)->page())
29 , m_batteryStatus(BatteryStatus::create())
29 { 30 {
30 m_hasEventListener = true; 31 m_hasEventListener = true;
31 startUpdating(); 32 startUpdating();
32 } 33 }
33 34
34 bool BatteryManager::charging() 35 bool BatteryManager::charging()
35 { 36 {
36 if (const BatteryStatus* lastData = BatteryDispatcher::instance().getLatestD ata()) 37 return m_batteryStatus->charging();
37 return lastData->charging();
38
39 return true;
40 } 38 }
41 39
42 double BatteryManager::chargingTime() 40 double BatteryManager::chargingTime()
43 { 41 {
44 if (const BatteryStatus* lastData = BatteryDispatcher::instance().getLatestD ata()) 42 return m_batteryStatus->chargingTime();
45 return lastData->chargingTime();
46
47 return 0;
48 } 43 }
49 44
50 double BatteryManager::dischargingTime() 45 double BatteryManager::dischargingTime()
51 { 46 {
52 if (const BatteryStatus* lastData = BatteryDispatcher::instance().getLatestD ata()) 47 return m_batteryStatus->dischargingTime();
53 return lastData->dischargingTime();
54
55 return std::numeric_limits<double>::infinity();
56 } 48 }
57 49
58 double BatteryManager::level() 50 double BatteryManager::level()
59 { 51 {
60 if (const BatteryStatus* lastData = BatteryDispatcher::instance().getLatestD ata()) 52 return m_batteryStatus->level();
61 return lastData->level();
62
63 return 1;
64 } 53 }
65 54
66 void BatteryManager::didChangeBatteryStatus(PassRefPtrWillBeRawPtr<Event> event) 55 void BatteryManager::didUpdateData()
67 { 56 {
68 ASSERT(RuntimeEnabledFeatures::batteryStatusEnabled()); 57 ASSERT(RuntimeEnabledFeatures::batteryStatusEnabled());
69 58
70 dispatchEvent(event); 59 RefPtr<BatteryStatus> oldStatus = m_batteryStatus;
60 m_batteryStatus = BatteryDispatcher::instance().latestData();
61
62 // BatteryDispatcher also holds a reference to m_batteryStatus.
63 ASSERT(m_batteryStatus->refCount() > 1);
64
65 Document* document = toDocument(executionContext());
66 if (document->activeDOMObjectsAreSuspended() || document->activeDOMObjectsAr eStopped())
67 return;
68
69 ASSERT(oldStatus);
70
71 if (m_batteryStatus->charging() != oldStatus->charging())
72 dispatchEvent(Event::create(EventTypeNames::chargingchange));
73 if (m_batteryStatus->chargingTime() != oldStatus->chargingTime())
74 dispatchEvent(Event::create(EventTypeNames::chargingtimechange));
75 if (m_batteryStatus->dischargingTime() != oldStatus->dischargingTime())
76 dispatchEvent(Event::create(EventTypeNames::dischargingtimechange));
77 if (m_batteryStatus->level() != oldStatus->level())
78 dispatchEvent(Event::create(EventTypeNames::levelchange));
71 } 79 }
72 80
73 void BatteryManager::registerWithDispatcher() 81 void BatteryManager::registerWithDispatcher()
74 { 82 {
75 BatteryDispatcher::instance().addClient(this); 83 BatteryDispatcher::instance().addController(this);
76 } 84 }
77 85
78 void BatteryManager::unregisterWithDispatcher() 86 void BatteryManager::unregisterWithDispatcher()
79 { 87 {
80 BatteryDispatcher::instance().removeClient(this); 88 BatteryDispatcher::instance().removeController(this);
81 } 89 }
82 90
83 bool BatteryManager::hasLastData() 91 bool BatteryManager::hasLastData()
84 { 92 {
85 return false; 93 return BatteryDispatcher::instance().latestData();
86 }
87
88 PassRefPtrWillBeRawPtr<Event> BatteryManager::getLastEvent()
89 {
90 // Events are dispached via BatteryManager::didChangeBatteryStatus()
91 return nullptr;
92 }
93
94 bool BatteryManager::isNullEvent(Event*)
95 {
96 return false;
97 }
98
99 Document* BatteryManager::document()
100 {
101 return toDocument(executionContext());
102 } 94 }
103 95
104 void BatteryManager::suspend() 96 void BatteryManager::suspend()
105 { 97 {
106 m_hasEventListener = false; 98 m_hasEventListener = false;
107 stopUpdating(); 99 stopUpdating();
108 } 100 }
109 101
110 void BatteryManager::resume() 102 void BatteryManager::resume()
111 { 103 {
112 m_hasEventListener = true; 104 m_hasEventListener = true;
113 startUpdating(); 105 startUpdating();
114 } 106 }
115 107
116 void BatteryManager::stop() 108 void BatteryManager::stop()
117 { 109 {
118 m_hasEventListener = false; 110 m_hasEventListener = false;
119 stopUpdating(); 111 stopUpdating();
120 } 112 }
121 113
122 } // namespace WebCore 114 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/battery/BatteryManager.h ('k') | Source/modules/device_light/DeviceLightController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698