Be a little more careul with inheriting principals. Bug 304690, r=dveditz, sr=jst, a=dveditz
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@225206 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -6292,9 +6292,11 @@ nsDocShell::InternalLoad(nsIURI * aURI,
|
||||
|
||||
nsCOMPtr<nsISupports> owner(aOwner);
|
||||
//
|
||||
// Get an owner from the current document if necessary
|
||||
// Get an owner from the current document if necessary, but only
|
||||
// if this is not an external load.
|
||||
//
|
||||
if (!owner && (aFlags & INTERNAL_LOAD_FLAGS_INHERIT_OWNER))
|
||||
if (aLoadType != LOAD_NORMAL_EXTERNAL && !owner &&
|
||||
(aFlags & INTERNAL_LOAD_FLAGS_INHERIT_OWNER))
|
||||
GetCurrentDocumentOwner(getter_AddRefs(owner));
|
||||
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user