зеркало из https://github.com/mozilla/pjs.git
Backing out fix for bug 419452 per bug 420059. a=beltzner
This commit is contained in:
Родитель
ea32998dd3
Коммит
ccd1ad8bde
|
@ -2992,7 +2992,6 @@ nsXULDocument::ResumeWalk()
|
|||
if (! count)
|
||||
break;
|
||||
|
||||
nsCOMPtr<nsIURI> overlayURI = mCurrentPrototype->GetURI();
|
||||
nsCOMPtr<nsIURI> 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
|
||||
|
|
Загрузка…
Ссылка в новой задаче