From 146d646035ccd3aa1ffb0a15f95cf7c5357b4d55 Mon Sep 17 00:00:00 2001 From: James Kitchener Date: Thu, 6 Feb 2014 09:46:29 -0500 Subject: [PATCH] Bug 964239 - Pass the parent document's base URI when loading a srcdoc iframe. r=bz --- content/base/src/nsFrameLoader.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp index 0177efb85f17..39b925bca048 100644 --- a/content/base/src/nsFrameLoader.cpp +++ b/content/base/src/nsFrameLoader.cpp @@ -526,6 +526,8 @@ nsFrameLoader::ReallyStartLoadingInternal() rv = NS_NewURI(getter_AddRefs(referrer), referrerStr); loadInfo->SetSrcdocData(srcdoc); + nsCOMPtr baseURI = mOwnerContent->GetBaseURI(); + loadInfo->SetBaseURI(baseURI); } else { rv = mOwnerContent->NodePrincipal()->GetURI(getter_AddRefs(referrer));