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

Unified Diff: Source/modules/battery/BatteryManager.cpp

Issue 618673002: Oilpan: reliably track listening PlatformEventControllers. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: Source/modules/battery/BatteryManager.cpp
diff --git a/Source/modules/battery/BatteryManager.cpp b/Source/modules/battery/BatteryManager.cpp
index a100fe59d4725c5a192a58003ca75cce92b25f1a..4fbe7a10e703f5d4617dad1adcddfc6b4ae9b592 100644
--- a/Source/modules/battery/BatteryManager.cpp
+++ b/Source/modules/battery/BatteryManager.cpp
@@ -89,7 +89,7 @@ void BatteryManager::didUpdateData()
}
Document* document = toDocument(executionContext());
- if (document->activeDOMObjectsAreSuspended() || document->activeDOMObjectsAreStopped())
+ if (!document || document->activeDOMObjectsAreSuspended() || document->activeDOMObjectsAreStopped())
mlamouri (slow - plz ping) 2014/09/30 17:08:49 Is there any situation where we expect !document?
return;
ASSERT(oldStatus);
@@ -148,6 +148,7 @@ bool BatteryManager::hasPendingActivity() const
void BatteryManager::trace(Visitor* visitor)
{
visitor->trace(m_batteryStatus);
+ PlatformEventController::trace(visitor);
EventTargetWithInlineData::trace(visitor);
}

Powered by Google App Engine
This is Rietveld 408576698