From 362cd90ede19a4bf2ddc5219fac8cd43bb42b6e1 Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Fri, 18 Jan 2013 09:49:59 -0800 Subject: [PATCH] Bug 831095: Remove LOOP_OVER_OBSERVERS. r=bz --- content/base/src/nsImageLoadingContent.cpp | 25 ++++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/content/base/src/nsImageLoadingContent.cpp b/content/base/src/nsImageLoadingContent.cpp index f9adac1b16c..9b80b70966c 100644 --- a/content/base/src/nsImageLoadingContent.cpp +++ b/content/base/src/nsImageLoadingContent.cpp @@ -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