From ccd1ad8bdeceba5eb4c80471b1e6b4b69764f38b Mon Sep 17 00:00:00 2001 From: "jst@mozilla.org" Date: Fri, 29 Feb 2008 22:29:46 -0800 Subject: [PATCH] Backing out fix for bug 419452 per bug 420059. a=beltzner --- content/xul/document/src/nsXULDocument.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp index a908496f444..0f56c33d1f3 100644 --- a/content/xul/document/src/nsXULDocument.cpp +++ b/content/xul/document/src/nsXULDocument.cpp @@ -2992,7 +2992,6 @@ nsXULDocument::ResumeWalk() if (! count) break; - nsCOMPtr overlayURI = mCurrentPrototype->GetURI(); nsCOMPtr uri = mUnloadedOverlays[count-1]; mUnloadedOverlays.RemoveObjectAt(count-1); @@ -3006,21 +3005,8 @@ nsXULDocument::ResumeWalk() continue; if (NS_FAILED(rv)) return rv; - if (shouldReturn) { - if (mOverlayLoadObservers.IsInitialized()) { - nsIObserver *obs = mOverlayLoadObservers.GetWeak(overlayURI); - if (obs) { - // This overlay has an unloaded overlay, so it will never - // notify. The best we can do is to notify for the unloaded - // overlay instead, assuming nobody is already notifiable - // for it. Note that this will confuse the observer. - if (!mOverlayLoadObservers.GetWeak(uri)) - mOverlayLoadObservers.Put(uri, obs); - mOverlayLoadObservers.Remove(overlayURI); - } - } + if (shouldReturn) return NS_OK; - } } // If we get here, there is nothing left for us to walk. The content