Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1646573: Part 3 - Fix OriginalFrameSrcLoad with DocumentChannel. r=mattwoodrow

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D90341
This commit is contained in:
Kris Maglione 2020-09-23 18:26:25 +00:00
parent 2a6d61ec20
commit 061206b7f2
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipc/glue/BackgroundUtils.cpp
View File

@ -517,6 +517,7 @@ nsresult LoadInfoToLoadInfoArgs(nsILoadInfo* aLoadInfo,
aLoadInfo->GetAllowInsecureRedirectToDataURI(), aLoadInfo->GetAllowInsecureRedirectToDataURI(),
aLoadInfo->GetBypassCORSChecks(), aLoadInfo->GetBypassCORSChecks(),
aLoadInfo->GetSkipContentPolicyCheckForWebRequest(), aLoadInfo->GetSkipContentPolicyCheckForWebRequest(),
aLoadInfo->GetOriginalFrameSrcLoad(),
aLoadInfo->GetForceInheritPrincipalDropped(), aLoadInfo->GetForceInheritPrincipalDropped(),
aLoadInfo->GetInnerWindowID(), aLoadInfo->GetBrowsingContextID(), aLoadInfo->GetInnerWindowID(), aLoadInfo->GetBrowsingContextID(),
aLoadInfo->GetFrameBrowsingContextID(), aLoadInfo->GetFrameBrowsingContextID(),
@ -774,6 +775,7 @@ nsresult LoadInfoArgsToLoadInfo(
loadInfoArgs.allowInsecureRedirectToDataURI(), loadInfoArgs.allowInsecureRedirectToDataURI(),
loadInfoArgs.bypassCORSChecks(), loadInfoArgs.bypassCORSChecks(),
loadInfoArgs.skipContentPolicyCheckForWebRequest(), loadInfoArgs.skipContentPolicyCheckForWebRequest(),
loadInfoArgs.originalFrameSrcLoad(),
loadInfoArgs.forceInheritPrincipalDropped(), loadInfoArgs.innerWindowID(), loadInfoArgs.forceInheritPrincipalDropped(), loadInfoArgs.innerWindowID(),
loadInfoArgs.browsingContextID(), loadInfoArgs.frameBrowsingContextID(), loadInfoArgs.browsingContextID(), loadInfoArgs.frameBrowsingContextID(),
loadInfoArgs.initialSecurityCheckDone(), loadInfoArgs.initialSecurityCheckDone(),

3
netwerk/base/LoadInfo.cpp
View File

@ -635,6 +635,7 @@ LoadInfo::LoadInfo(
bool aBrowserWouldUpgradeInsecureRequests, bool aForceAllowDataURI, bool aBrowserWouldUpgradeInsecureRequests, bool aForceAllowDataURI,
bool aAllowInsecureRedirectToDataURI, bool aBypassCORSChecks, bool aAllowInsecureRedirectToDataURI, bool aBypassCORSChecks,
bool aSkipContentPolicyCheckForWebRequest, bool aSkipContentPolicyCheckForWebRequest,
bool aOriginalFrameSrcLoad,
bool aForceInheritPrincipalDropped, uint64_t aInnerWindowID, bool aForceInheritPrincipalDropped, uint64_t aInnerWindowID,
uint64_t aBrowsingContextID, uint64_t aFrameBrowsingContextID, uint64_t aBrowsingContextID, uint64_t aFrameBrowsingContextID,
bool aInitialSecurityCheckDone, bool aIsThirdPartyContext, bool aInitialSecurityCheckDone, bool aIsThirdPartyContext,
@ -683,7 +684,7 @@ LoadInfo::LoadInfo(
mBypassCORSChecks(aBypassCORSChecks), mBypassCORSChecks(aBypassCORSChecks),
mSkipContentPolicyCheckForWebRequest( mSkipContentPolicyCheckForWebRequest(
aSkipContentPolicyCheckForWebRequest), aSkipContentPolicyCheckForWebRequest),
mOriginalFrameSrcLoad(false), mOriginalFrameSrcLoad(aOriginalFrameSrcLoad),
mForceInheritPrincipalDropped(aForceInheritPrincipalDropped), mForceInheritPrincipalDropped(aForceInheritPrincipalDropped),
mInnerWindowID(aInnerWindowID), mInnerWindowID(aInnerWindowID),
mBrowsingContextID(aBrowsingContextID), mBrowsingContextID(aBrowsingContextID),

1
netwerk/base/LoadInfo.h
View File

@ -202,6 +202,7 @@ class LoadInfo final : public nsILoadInfo {
bool aBrowserWouldUpgradeInsecureRequests, bool aForceAllowDataURI, bool aBrowserWouldUpgradeInsecureRequests, bool aForceAllowDataURI,
bool aAllowInsecureRedirectToDataURI, bool aBypassCORSChecks, bool aAllowInsecureRedirectToDataURI, bool aBypassCORSChecks,
bool aSkipContentPolicyCheckForWebRequest, bool aSkipContentPolicyCheckForWebRequest,
bool aOriginalFrameSrcLoad,
bool aForceInheritPrincipalDropped, uint64_t aInnerWindowID, bool aForceInheritPrincipalDropped, uint64_t aInnerWindowID,
uint64_t aBrowsingContextID, uint64_t aFrameBrowsingContextID, uint64_t aBrowsingContextID, uint64_t aFrameBrowsingContextID,
bool aInitialSecurityCheckDone, bool aIsThirdPartyRequest, bool aInitialSecurityCheckDone, bool aIsThirdPartyRequest,

1
netwerk/ipc/NeckoChannelParams.ipdlh
View File

@ -94,6 +94,7 @@ struct LoadInfoArgs
bool allowInsecureRedirectToDataURI; bool allowInsecureRedirectToDataURI;
bool bypassCORSChecks; bool bypassCORSChecks;
bool skipContentPolicyCheckForWebRequest; bool skipContentPolicyCheckForWebRequest;
bool originalFrameSrcLoad;
bool forceInheritPrincipalDropped; bool forceInheritPrincipalDropped;
uint64_t innerWindowID; uint64_t innerWindowID;
uint64_t browsingContextID; uint64_t browsingContextID;

2
toolkit/components/extensions/test/mochitest/mochitest-common.ini
View File

@ -82,7 +82,7 @@ skip-if = headless # Bug 1405872
[test_ext_contentscript_about_blank.html] [test_ext_contentscript_about_blank.html]
skip-if = os == 'android' # bug 1369440 skip-if = os == 'android' # bug 1369440
[test_ext_contentscript_activeTab.html] [test_ext_contentscript_activeTab.html]
skip-if = os == 'android' || true # Broken by DocumentChannel skip-if = os == 'android' || fission
[test_ext_contentscript_cache.html] [test_ext_contentscript_cache.html]
skip-if = (os == 'linux' && debug) || (toolkit == 'android' && debug) # bug 1348241 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 fail-if = xorigin # TypeError: can't access property "staticScripts", ext is undefined - Should not throw any errors