Bug 1464252 - Remove global observers functionality from the observer service; r?froydnj
MozReview-Commit-ID: HGtG3obDryw
--- a/xpcom/ds/nsObserverService.cpp
+++ b/xpcom/ds/nsObserverService.cpp
@@ -18,18 +18,16 @@
#include "xpcpublic.h"
#include "mozilla/net/NeckoCommon.h"
#include "mozilla/Services.h"
#include "mozilla/Telemetry.h"
#include "mozilla/TimeStamp.h"
#include "nsString.h"
#include "GeckoProfiler.h"
-#define NOTIFY_GLOBAL_OBSERVERS
-
static const uint32_t kMinTelemetryNotifyObserversLatencyMs = 1;
// Log module for nsObserverService logging...
//
// To enable logging (see prlog.h for full details):
//
// set MOZ_LOG=ObserverService:5
// set MOZ_LOG_FILE=service.log
@@ -292,23 +290,16 @@ NS_IMETHODIMP nsObserverService::NotifyO
AUTO_PROFILER_LABEL_DYNAMIC_CSTR(
"nsObserverService::NotifyObservers", OTHER, aTopic);
nsObserverList* observerList = mObserverTopicTable.GetEntry(aTopic);
if (observerList) {
observerList->NotifyObservers(aSubject, aTopic, aSomeData);
}
-#ifdef NOTIFY_GLOBAL_OBSERVERS
- observerList = mObserverTopicTable.GetEntry("*");
- if (observerList) {
- observerList->NotifyObservers(aSubject, aTopic, aSomeData);
- }
-#endif
-
uint32_t latencyMs = round((TimeStamp::Now() - start).ToMilliseconds());
if (latencyMs >= kMinTelemetryNotifyObserversLatencyMs) {
Telemetry::Accumulate(Telemetry::NOTIFY_OBSERVERS_LATENCY_MS,
nsDependentCString(aTopic),
latencyMs);
}
return NS_OK;