diff --git a/ipc/glue/BackgroundUtils.cpp b/ipc/glue/BackgroundUtils.cpp index 2f5260de5578..82301b998bad 100644 --- a/ipc/glue/BackgroundUtils.cpp +++ b/ipc/glue/BackgroundUtils.cpp @@ -517,6 +517,7 @@ nsresult LoadInfoToLoadInfoArgs(nsILoadInfo* aLoadInfo, aLoadInfo->GetAllowInsecureRedirectToDataURI(), aLoadInfo->GetBypassCORSChecks(), aLoadInfo->GetSkipContentPolicyCheckForWebRequest(), + aLoadInfo->GetOriginalFrameSrcLoad(), aLoadInfo->GetForceInheritPrincipalDropped(), aLoadInfo->GetInnerWindowID(), aLoadInfo->GetBrowsingContextID(), aLoadInfo->GetFrameBrowsingContextID(), @@ -774,6 +775,7 @@ nsresult LoadInfoArgsToLoadInfo( loadInfoArgs.allowInsecureRedirectToDataURI(), loadInfoArgs.bypassCORSChecks(), loadInfoArgs.skipContentPolicyCheckForWebRequest(), + loadInfoArgs.originalFrameSrcLoad(), loadInfoArgs.forceInheritPrincipalDropped(), loadInfoArgs.innerWindowID(), loadInfoArgs.browsingContextID(), loadInfoArgs.frameBrowsingContextID(), loadInfoArgs.initialSecurityCheckDone(), diff --git a/netwerk/base/LoadInfo.cpp b/netwerk/base/LoadInfo.cpp index a590ebef933c..11b6bb6c3f0a 100644 --- a/netwerk/base/LoadInfo.cpp +++ b/netwerk/base/LoadInfo.cpp @@ -635,6 +635,7 @@ LoadInfo::LoadInfo( bool aBrowserWouldUpgradeInsecureRequests, bool aForceAllowDataURI, bool aAllowInsecureRedirectToDataURI, bool aBypassCORSChecks, bool aSkipContentPolicyCheckForWebRequest, + bool aOriginalFrameSrcLoad, bool aForceInheritPrincipalDropped, uint64_t aInnerWindowID, uint64_t aBrowsingContextID, uint64_t aFrameBrowsingContextID, bool aInitialSecurityCheckDone, bool aIsThirdPartyContext, @@ -683,7 +684,7 @@ LoadInfo::LoadInfo( mBypassCORSChecks(aBypassCORSChecks), mSkipContentPolicyCheckForWebRequest( aSkipContentPolicyCheckForWebRequest), - mOriginalFrameSrcLoad(false), + mOriginalFrameSrcLoad(aOriginalFrameSrcLoad), mForceInheritPrincipalDropped(aForceInheritPrincipalDropped), mInnerWindowID(aInnerWindowID), mBrowsingContextID(aBrowsingContextID), diff --git a/netwerk/base/LoadInfo.h b/netwerk/base/LoadInfo.h index afce92ea06e8..9136df6bbaae 100644 --- a/netwerk/base/LoadInfo.h +++ b/netwerk/base/LoadInfo.h @@ -202,6 +202,7 @@ class LoadInfo final : public nsILoadInfo { bool aBrowserWouldUpgradeInsecureRequests, bool aForceAllowDataURI, bool aAllowInsecureRedirectToDataURI, bool aBypassCORSChecks, bool aSkipContentPolicyCheckForWebRequest, + bool aOriginalFrameSrcLoad, bool aForceInheritPrincipalDropped, uint64_t aInnerWindowID, uint64_t aBrowsingContextID, uint64_t aFrameBrowsingContextID, bool aInitialSecurityCheckDone, bool aIsThirdPartyRequest, diff --git a/netwerk/ipc/NeckoChannelParams.ipdlh b/netwerk/ipc/NeckoChannelParams.ipdlh index 9c7bda998599..40139e6829b2 100644 --- a/netwerk/ipc/NeckoChannelParams.ipdlh +++ b/netwerk/ipc/NeckoChannelParams.ipdlh @@ -94,6 +94,7 @@ struct LoadInfoArgs bool allowInsecureRedirectToDataURI; bool bypassCORSChecks; bool skipContentPolicyCheckForWebRequest; + bool originalFrameSrcLoad; bool forceInheritPrincipalDropped; uint64_t innerWindowID; uint64_t browsingContextID; diff --git a/toolkit/components/extensions/test/mochitest/mochitest-common.ini b/toolkit/components/extensions/test/mochitest/mochitest-common.ini index 507d5c540567..dcaa9c2d45f0 100644 --- a/toolkit/components/extensions/test/mochitest/mochitest-common.ini +++ b/toolkit/components/extensions/test/mochitest/mochitest-common.ini @@ -82,7 +82,7 @@ skip-if = headless # Bug 1405872 [test_ext_contentscript_about_blank.html] skip-if = os == 'android' # bug 1369440 [test_ext_contentscript_activeTab.html] -skip-if = os == 'android' || true # Broken by DocumentChannel +skip-if = os == 'android' || fission [test_ext_contentscript_cache.html] skip-if = (os == 'linux' && debug) || (toolkit == 'android' && debug) # bug 1348241 fail-if = xorigin # TypeError: can't access property "staticScripts", ext is undefined - Should not throw any errors