corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1478742 - IPDLize nsDocShellLoadState; r=nika

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D13958
This commit is contained in:
Kyle Machulis
2018-12-19 22:22:09 +00:00
parent ae27c4df35
commit 2e98bae337
8 changed files with 168 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
docshell/base/nsDocShellLoadState.cpp
View File

@@ -13,6 +13,8 @@
#include "mozilla/OriginAttributes.h"
#include "mozilla/NullPrincipal.h"
#include "mozilla/dom/PContent.h"
nsDocShellLoadState::nsDocShellLoadState(nsIURI* aURI)
: mURI(aURI),
mResultPrincipalURIIsSome(false),
@@ -35,6 +37,33 @@ nsDocShellLoadState::nsDocShellLoadState(nsIURI* aURI)
MOZ_ASSERT(aURI, "Cannot create a LoadState with a null URI!");
}
nsDocShellLoadState::nsDocShellLoadState(DocShellLoadStateInit& aLoadState)
{
MOZ_ASSERT(aLoadState.URI(), "Cannot create a LoadState with a null URI!");
mResultPrincipalURIIsSome = aLoadState.ResultPrincipalURIIsSome();
mKeepResultPrincipalURIIfSet = aLoadState.KeepResultPrincipalURIIfSet();
mLoadReplace = aLoadState.LoadReplace();
mInheritPrincipal = aLoadState.InheritPrincipal();
mPrincipalIsExplicit = aLoadState.PrincipalIsExplicit();
mForceAllowDataURI = aLoadState.ForceAllowDataURI();
mOriginalFrameSrc = aLoadState.OriginalFrameSrc();
mSendReferrer = aLoadState.SendReferrer();
mReferrerPolicy = (mozilla::net::ReferrerPolicy)aLoadState.ReferrerPolicy();
mLoadType = aLoadState.LoadType();
mTarget = aLoadState.Target();
mLoadFlags = aLoadState.LoadFlags();
mFirstParty = aLoadState.FirstParty();
mTypeHint = aLoadState.TypeHint();
mFileName = aLoadState.FileName();
mIsFromProcessingFrameAttributes = aLoadState.IsFromProcessingFrameAttributes();
mReferrer = aLoadState.Referrer();
mURI = aLoadState.URI();
mOriginalURI = aLoadState.OriginalURI();
mBaseURI = aLoadState.BaseURI();
mTriggeringPrincipal = aLoadState.TriggeringPrincipal();
mPrincipalToInherit = aLoadState.PrincipalToInherit();
}
nsDocShellLoadState::~nsDocShellLoadState() {}
nsIURI* nsDocShellLoadState::Referrer() const { return mReferrer; }
@@ -385,3 +414,30 @@ void nsDocShellLoadState::CalculateLoadURIFlags() {
mLoadFlags |= nsDocShell::INTERNAL_LOAD_FLAGS_ORIGINAL_FRAME_SRC;
}
}
DocShellLoadStateInit nsDocShellLoadState::Serialize() {
DocShellLoadStateInit loadState;
loadState.ResultPrincipalURIIsSome() = mResultPrincipalURIIsSome;
loadState.KeepResultPrincipalURIIfSet() = mKeepResultPrincipalURIIfSet;
loadState.LoadReplace() = mLoadReplace;
loadState.InheritPrincipal() = mInheritPrincipal;
loadState.PrincipalIsExplicit() = mPrincipalIsExplicit;
loadState.ForceAllowDataURI() = mForceAllowDataURI;
loadState.OriginalFrameSrc() = mOriginalFrameSrc;
loadState.SendReferrer() = mSendReferrer;
loadState.ReferrerPolicy() = mReferrerPolicy;
loadState.LoadType() = mLoadType;
loadState.Target() = mTarget;
loadState.LoadFlags() = mLoadFlags;
loadState.FirstParty() = mFirstParty;
loadState.TypeHint() = mTypeHint;
loadState.FileName() = mFileName;
loadState.IsFromProcessingFrameAttributes() = mIsFromProcessingFrameAttributes;
loadState.Referrer() = mReferrer;
loadState.URI() = mURI;
loadState.OriginalURI() = mOriginalURI;
loadState.BaseURI() = mBaseURI;
loadState.TriggeringPrincipal() = mTriggeringPrincipal;
loadState.PrincipalToInherit() = mPrincipalToInherit;
return loadState;
}