Backed out 6 changesets (bug 1626404) for bustages on LocationBase.cpp . CLOSED TREE
Backed out changeset a399dfff2725 (bug 1626404) Backed out changeset ad3272abd830 (bug 1626404) Backed out changeset 322c170e8301 (bug 1626404) Backed out changeset df37f57cfa1d (bug 1626404) Backed out changeset e255e4c9e665 (bug 1626404) Backed out changeset 51120d617459 (bug 1626404)
This commit is contained in:
@@ -66,7 +66,6 @@ nsDocShellLoadState::nsDocShellLoadState(
|
||||
mReferrerInfo = aLoadState.ReferrerInfo();
|
||||
mURI = aLoadState.URI();
|
||||
mOriginalURI = aLoadState.OriginalURI();
|
||||
mSourceBrowsingContext = aLoadState.SourceBrowsingContext();
|
||||
mBaseURI = aLoadState.BaseURI();
|
||||
mTriggeringPrincipal = aLoadState.TriggeringPrincipal();
|
||||
mPrincipalToInherit = aLoadState.PrincipalToInherit();
|
||||
@@ -422,9 +421,12 @@ void nsDocShellLoadState::SetSrcdocData(const nsAString& aSrcdocData) {
|
||||
mSrcdocData = aSrcdocData;
|
||||
}
|
||||
|
||||
void nsDocShellLoadState::SetSourceBrowsingContext(
|
||||
BrowsingContext* aSourceBrowsingContext) {
|
||||
mSourceBrowsingContext = aSourceBrowsingContext;
|
||||
nsIDocShell* nsDocShellLoadState::SourceDocShell() const {
|
||||
return mSourceDocShell;
|
||||
}
|
||||
|
||||
void nsDocShellLoadState::SetSourceDocShell(nsIDocShell* aSourceDocShell) {
|
||||
mSourceDocShell = aSourceDocShell;
|
||||
}
|
||||
|
||||
nsIURI* nsDocShellLoadState::BaseURI() const { return mBaseURI; }
|
||||
@@ -648,7 +650,6 @@ DocShellLoadStateInit nsDocShellLoadState::Serialize() {
|
||||
mIsFromProcessingFrameAttributes;
|
||||
loadState.URI() = mURI;
|
||||
loadState.OriginalURI() = mOriginalURI;
|
||||
loadState.SourceBrowsingContext() = mSourceBrowsingContext;
|
||||
loadState.BaseURI() = mBaseURI;
|
||||
loadState.TriggeringPrincipal() = mTriggeringPrincipal;
|
||||
loadState.PrincipalToInherit() = mPrincipalToInherit;
|
||||
|
||||
Reference in New Issue
Block a user