mozilla-central: changeset 279367:41a19217d481cde702d2eb0fc3461e568a0538e3

author	Yoshi Huang <allstars.chh@mozilla.com>
	Fri, 04 Dec 2015 16:18:57 +0800
changeset 279367	41a19217d481cde702d2eb0fc3461e568a0538e3
parent 279366	2300f7506a8c3c8a685dcbb1a430aad134b8ede8
child 279368	694270a8ddd9b5c77d26b75bfb62a46a6af2bca7
push id	29880
push user	cbook@mozilla.com
push date	Tue, 12 Jan 2016 10:50:45 +0000
treeherder	mozilla-central@19dcfc1c2e18 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	sicking
bugs	1230459
milestone	46.0a1
first release with	nightly linux32 e790bba372f1 / 46.0a1 / 20160112030227 / files nightly linux64 e790bba372f1 / 46.0a1 / 20160112030227 / files nightly mac e790bba372f1 / 46.0a1 / 20160112030227 / files nightly win32 e790bba372f1 / 46.0a1 / 20160112030227 / files nightly win64 e790bba372f1 / 46.0a1 / 20160112030227 / files
last release without	nightly linux32 6020a4cb41a7 / 46.0a1 / 20160111030207 / files nightly linux64 6020a4cb41a7 / 46.0a1 / 20160111030207 / files nightly mac 6020a4cb41a7 / 46.0a1 / 20160111030207 / files nightly win32 6020a4cb41a7 / 46.0a1 / 20160111030207 / files nightly win64 6020a4cb41a7 / 46.0a1 / 20160111030207 / files

--- a/docshell/base/LoadContext.cpp
+++ b/docshell/base/LoadContext.cpp
@@ -46,17 +46,17 @@ LoadContext::LoadContext(nsIPrincipal* a
   , mIsContent(true)
   , mUsePrivateBrowsing(false)
   , mUseRemoteTabs(false)
 #ifdef DEBUG
   , mIsNotNull(true)
 #endif
 {
   PrincipalOriginAttributes poa = BasePrincipal::Cast(aPrincipal)->OriginAttributesRef();
-  mOriginAttributes = DocShellOriginAttributes(poa.mAppId, poa.mInBrowser);
+  mOriginAttributes.InheritFromDocToChildDocShell(poa);
 
   if (!aOptionalBase) {
     return;
   }
 
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(aOptionalBase->GetIsContent(&mIsContent)));
   MOZ_ALWAYS_TRUE(
     NS_SUCCEEDED(aOptionalBase->GetUsePrivateBrowsing(&mUsePrivateBrowsing)));