Bug 831095: Remove LOOP_OVER_OBSERVERS. r=bz

This commit is contained in:
Kyle Huey 2013-01-18 09:49:59 -08:00
parent e97ded2b9d
commit 362cd90ede

View File

@ -109,19 +109,6 @@ nsImageLoadingContent::~nsImageLoadingContent()
"Observers still registered?");
}
// Macro to call some func on each observer. This handles observers
// removing themselves.
#define LOOP_OVER_OBSERVERS(func_) \
PR_BEGIN_MACRO \
for (ImageObserver* observer = &mObserverList, *next; observer; \
observer = next) { \
next = observer->mNext; \
if (observer->mObserver) { \
observer->mObserver->func_; \
} \
} \
PR_END_MACRO
/*
* imgINotificationObserver impl
*/
@ -142,7 +129,17 @@ nsImageLoadingContent::Notify(imgIRequest* aRequest,
"Unknown request");
}
LOOP_OVER_OBSERVERS(Notify(aRequest, aType, aData));
{
nsAutoScriptBlocker scriptBlocker;
for (ImageObserver* observer = &mObserverList, *next; observer;
observer = next) {
next = observer->mNext;
if (observer->mObserver) {
observer->mObserver->Notify(aRequest, aType, aData);
}
}
}
if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
// Have to check for state changes here, since we might have been in