From 709d3a9d26f2ea0b7994f8c4c1c55c68f12abf70 Mon Sep 17 00:00:00 2001 From: "radha%netscape.com" Date: Sat, 16 Mar 2002 04:18:40 +0000 Subject: [PATCH] Fix for bug 125225. locationbar and top.location updated when document.write() is done on iframes. r=adamlock sr=rpotts a=asa. git-svn-id: svn://10.0.0.236/trunk@116691 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index aa70b81a826..fbae0051f78 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -3648,10 +3648,14 @@ nsDocShell::OnStateChange(nsIWebProgress * aProgress, nsIRequest * aRequest, PRInt32 aStateFlags, nsresult aStatus) { nsresult rv; + // Update the busy cursor if ((~aStateFlags & (STATE_START | STATE_IS_NETWORK)) == 0) { - nsCOMPtr wcwgChannel(do_QueryInterface(aRequest)); - if (wcwgChannel && !mLSHE && (mItemType == typeContent)) { + nsCOMPtr wcwgChannel(do_QueryInterface(aRequest)); + nsCOMPtr webProgress(do_QueryInterface(mLoadCookie)); + + // Was the wyciwyg document loaded on this docshell? + if (wcwgChannel && !mLSHE && (mItemType == typeContent) && aProgress == webProgress.get()) { nsCOMPtr uri; wcwgChannel->GetURI(getter_AddRefs(uri));