Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 2bbc7be933e2 (bug 1309070) for causing bug 1320041.

Browse Source
This commit is contained in:
Andrew McCreight 2016-11-26 09:31:17 -08:00
parent b66ce7516a
commit 908a323277
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docshell/base/nsDocShell.cpp
View File

@ -5754,8 +5754,6 @@ nsDocShell::Destroy()
NS_ASSERTION(mItemType == typeContent || mItemType == typeChrome,
"Unexpected item type in docshell");
AssertOriginAttributesMatchPrivateBrowsing();
if (!mIsBeingDestroyed) {
nsCOMPtr<nsIObserverService> serv = services::GetObserverService();
if (serv) {
@ -9513,8 +9511,6 @@ public:
, mLoadingPrincipal(aLoadingPrincipal)
, mInPrivateBrowsing(aInPrivateBrowsing)
{
MOZ_DIAGNOSTIC_ASSERT(
(BasePrincipal::Cast(aLoadingPrincipal)->OriginAttributesRef().mPrivateBrowsingId > 0) == aInPrivateBrowsing);
}
NS_IMETHOD
@ -9557,9 +9553,6 @@ nsDocShell::CopyFavicon(nsIURI* aOldURI,
nsIPrincipal* aLoadingPrincipal,
bool aInPrivateBrowsing)
{
MOZ_DIAGNOSTIC_ASSERT(
(BasePrincipal::Cast(aLoadingPrincipal)->OriginAttributesRef().mPrivateBrowsingId > 0) == aInPrivateBrowsing);
if (XRE_IsContentProcess()) {
dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
if (contentChild) {
@ -14368,7 +14361,6 @@ nsDocShell::SetOriginAttributes(const DocShellOriginAttributes& aAttrs)
}
SetPrivateBrowsing(isPrivate);
AssertOriginAttributesMatchPrivateBrowsing();
return NS_OK;
}