Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1037936 - Part 2: Replace second nsCxPusher in nsWindowWatcher::OpenWindowInternal. r=bholley

Browse Source
This commit is contained in:
Bob Owen 2014-07-28 07:57:31 +01:00
parent 903c8500cc
commit af9d22406e
1 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
embedding/components/windowwatcher/src/nsWindowWatcher.cpp
View File

@ -60,6 +60,7 @@
#include "nsSandboxFlags.h"
#include "mozilla/Preferences.h"
#include "mozilla/dom/DOMStorage.h"
#include "mozilla/dom/ScriptSettings.h"
#ifdef USEWEAKREFS
#include "nsIWeakReference.h"
@ -875,26 +876,7 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
}
nsCOMPtr<nsIDocShellLoadInfo> loadInfo;
if (uriToLoad && aNavigate) { // get the script principal and pass it to docshell
// The historical ordering of attempts here is:
// (1) Stack-top cx.
// (2) cx associated with aParent.
// (3) Safe JSContext.
//
// We could just use an AutoJSContext here if it weren't for (2), which
// is probably nonsensical anyway. But we preserve the old semantics for
// now, because this is part of a large patch where we don't want to risk
// subtle behavioral modifications.
cx = nsContentUtils::GetCurrentJSContext();
nsCxPusher pusher;
if (!cx) {
cx = GetJSContextFromWindow(aParent);
if (!cx)
cx = nsContentUtils::GetSafeJSContext();
pusher.Push(cx);
}
if (uriToLoad && aNavigate) {
newDocShell->CreateLoadInfo(getter_AddRefs(loadInfo));
NS_ENSURE_TRUE(loadInfo, NS_ERROR_FAILURE);
@ -902,29 +884,25 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent,
loadInfo->SetOwner(subjectPrincipal);
}
// Set the new window's referrer from the calling context's document:
// get its document, if any
JSContext* ccx = nsContentUtils::GetCurrentJSContext();
if (ccx) {
nsIScriptGlobalObject *sgo = nsJSUtils::GetDynamicScriptGlobal(ccx);
nsCOMPtr<nsPIDOMWindow> w(do_QueryInterface(sgo));
if (w) {
nsCOMPtr<nsPIDOMWindow> referrerWindow =
do_QueryInterface(dom::BrokenGetEntryGlobal());
if (!referrerWindow) {
referrerWindow = do_QueryInterface(aParent);
}
if (referrerWindow) {
/* 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<nsIDocument> doc = w->GetExtantDoc();
nsCOMPtr<nsIDocument> doc = referrerWindow->GetExtantDoc();
if (doc) {
// Set the referrer
loadInfo->SetReferrer(doc->GetDocumentURI());
}
}
}
}
if (isNewToplevelWindow) {
// Notify observers that the window is open and ready.