From 9be47282e7ecdc1e7cd824f717bdbd95b36b1928 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Sat, 28 Apr 2007 03:40:14 +0000 Subject: [PATCH] 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 --- mozilla/docshell/base/nsDocShell.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index d5cc7aad1d0..50d3e11eb17 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -6292,9 +6292,11 @@ nsDocShell::InternalLoad(nsIURI * aURI, nsCOMPtr 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)); //