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

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

Issue 2587913002: Rename activeDOMObjectsAreSuspended to isContextSuspended (Closed)
Patch Set: temp Created 4 years 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 "modules/battery/BatteryManager.h" 5 #include "modules/battery/BatteryManager.h"
6 6
7 #include "core/dom/DOMException.h" 7 #include "core/dom/DOMException.h"
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"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 BatteryStatus oldStatus = m_batteryStatus; 63 BatteryStatus oldStatus = m_batteryStatus;
64 m_batteryStatus = *BatteryDispatcher::instance().latestData(); 64 m_batteryStatus = *BatteryDispatcher::instance().latestData();
65 65
66 if (m_batteryProperty->getState() == ScriptPromisePropertyBase::Pending) { 66 if (m_batteryProperty->getState() == ScriptPromisePropertyBase::Pending) {
67 m_batteryProperty->resolve(this); 67 m_batteryProperty->resolve(this);
68 return; 68 return;
69 } 69 }
70 70
71 Document* document = toDocument(getExecutionContext()); 71 Document* document = toDocument(getExecutionContext());
72 DCHECK(document); 72 DCHECK(document);
73 if (document->activeDOMObjectsAreSuspended() || 73 if (document->isContextSuspended() || document->isContextDestroyed())
74 document->isContextDestroyed())
75 return; 74 return;
76 75
77 if (m_batteryStatus.charging() != oldStatus.charging()) 76 if (m_batteryStatus.charging() != oldStatus.charging())
78 dispatchEvent(Event::create(EventTypeNames::chargingchange)); 77 dispatchEvent(Event::create(EventTypeNames::chargingchange));
79 if (m_batteryStatus.charging_time() != oldStatus.charging_time()) 78 if (m_batteryStatus.charging_time() != oldStatus.charging_time())
80 dispatchEvent(Event::create(EventTypeNames::chargingtimechange)); 79 dispatchEvent(Event::create(EventTypeNames::chargingtimechange));
81 if (m_batteryStatus.discharging_time() != oldStatus.discharging_time()) 80 if (m_batteryStatus.discharging_time() != oldStatus.discharging_time())
82 dispatchEvent(Event::create(EventTypeNames::dischargingtimechange)); 81 dispatchEvent(Event::create(EventTypeNames::dischargingtimechange));
83 if (m_batteryStatus.level() != oldStatus.level()) 82 if (m_batteryStatus.level() != oldStatus.level())
84 dispatchEvent(Event::create(EventTypeNames::levelchange)); 83 dispatchEvent(Event::create(EventTypeNames::levelchange));
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 } 118 }
120 119
121 DEFINE_TRACE(BatteryManager) { 120 DEFINE_TRACE(BatteryManager) {
122 visitor->trace(m_batteryProperty); 121 visitor->trace(m_batteryProperty);
123 PlatformEventController::trace(visitor); 122 PlatformEventController::trace(visitor);
124 EventTargetWithInlineData::trace(visitor); 123 EventTargetWithInlineData::trace(visitor);
125 SuspendableObject::trace(visitor); 124 SuspendableObject::trace(visitor);
126 } 125 }
127 126
128 } // namespace blink 127 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698