author | Ehsan Akhgari <ehsan@mozilla.com> |
Mon, 24 Oct 2016 15:28:21 -0400 | |
changeset 362242 | 229dc3c9fb3622e1eb2ef1794081cd17a5cfeb0a |
parent 362241 | 91152c0137119ef16426b8c2297dc030bd73c64e |
child 362243 | a5f3e15356a89e450eaaa66fbafda36ed3b48a37 |
push id | 6795 |
push user | jlund@mozilla.com |
push date | Mon, 23 Jan 2017 14:19:46 +0000 |
treeherder | mozilla-beta@76101b503191 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | baku |
bugs | 1312527 |
milestone | 52.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -3736,19 +3736,19 @@ nsDocShell::FindItemWithName(const char1 } void nsDocShell::AssertOriginAttributesMatchPrivateBrowsing() { // Chrome docshells must not have a private browsing OriginAttribute // Content docshells must maintain the equality: // mOriginAttributes.mPrivateBrowsingId == mPrivateBrowsingId if (mItemType == typeChrome) { - MOZ_ASSERT(mOriginAttributes.mPrivateBrowsingId == 0); + MOZ_DIAGNOSTIC_ASSERT(mOriginAttributes.mPrivateBrowsingId == 0); } else { - MOZ_ASSERT(mOriginAttributes.mPrivateBrowsingId == mPrivateBrowsingId); + MOZ_DIAGNOSTIC_ASSERT(mOriginAttributes.mPrivateBrowsingId == mPrivateBrowsingId); } } nsresult nsDocShell::DoFindItemWithName(const char16_t* aName, nsISupports* aRequestor, nsIDocShellTreeItem* aOriginalRequestor, nsIDocShellTreeItem** aResult)