Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

during window creation, fetch the referring URL from the caller's document only if the document already exists. bug 36016 r=hyatt,pinkerton

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@113750 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
danm%netscape.com
2002-02-06 03:51:14 +00:00
parent bcd760ecc6
commit 65b198cffd
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
View File

@@ -74,6 +74,7 @@
#include "nsIWebNavigation.h"
#include "nsIWindowCreator.h"
#include "nsIXPConnect.h"
#include "nsPIDOMWindow.h"
#ifdef XP_UNIX
// please see bug 78421 for the eventual "right" fix for this
@@ -652,27 +653,32 @@ nsWindowWatcher::OpenWindowJS(nsIDOMWindow *aParent,
}
}
// Get the calling context off the JS context stack
// Set the new window's referrer from the calling context's document:
// get the calling context off the JS context stack
nsCOMPtr<nsIJSContextStack> stack = do_GetService(sJSStackContractID);
JSContext* ccx = nsnull;
// get its document, if any
if (stack && NS_SUCCEEDED(stack->Peek(&ccx)) && ccx) {
nsCOMPtr<nsIScriptGlobalObject> sgo;
nsCOMPtr<nsIScriptGlobalObject> sgo;
nsWWJSUtils::nsGetStaticScriptGlobal(ccx, ::JS_GetGlobalObject(ccx),
getter_AddRefs(sgo));
nsCOMPtr<nsIDOMWindow> w(do_QueryInterface(sgo));
nsCOMPtr<nsPIDOMWindow> w(do_QueryInterface(sgo));
if (w) {
/* use the URL from the *extant* document, if any. The usual accessor
GetDocument will synchronously create an about:blank document if
it has no better answer, and we only care about a real document.
Also using GetDocument to force document creation seems to
screw up focus in the hidden window; see bug 36016.
*/
nsCOMPtr<nsIDOMDocument> document;
// Get the document from the window.
w->GetDocument(getter_AddRefs(document));
w->GetExtantDocument(getter_AddRefs(document));
nsCOMPtr<nsIDocument> doc(do_QueryInterface(document));
if (doc) {
nsCOMPtr<nsIURI> uri;
doc->GetDocumentURL(getter_AddRefs(uri));