author | Eugen Sawin <esawin@mozilla.com> |
Fri, 27 Apr 2018 23:48:04 +0200 | |
changeset 416054 | dc0d4ccef9762d420355af88de59cf7d7eac54be |
parent 416053 | f7289b97cdf13377957a233452da38784970592f |
child 416075 | 5037bf398c93f85b65b02b20f09a32bc347cda41 |
push id | 102716 |
push user | esawin@mozilla.com |
push date | Fri, 27 Apr 2018 21:50:48 +0000 |
treeherder | mozilla-inbound@dc0d4ccef976 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | me |
bugs | 1439013 |
milestone | 61.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 @@ -9589,19 +9589,21 @@ nsDocShell::InternalLoad(nsIURI* aURI, } // If we are a noopener load, we just hand the whole thing over to our // window. if (aFlags & INTERNAL_LOAD_FLAGS_NO_OPENER) { // Various asserts that we know to hold because NO_OPENER loads can only // happen for links. MOZ_ASSERT(!aLoadReplace); MOZ_ASSERT(aPrincipalToInherit == aTriggeringPrincipal); - MOZ_ASSERT(aFlags == INTERNAL_LOAD_FLAGS_NO_OPENER || - aFlags == (INTERNAL_LOAD_FLAGS_NO_OPENER | - INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER)); + MOZ_ASSERT((aFlags ^ INTERNAL_LOAD_FLAGS_IS_USER_TRIGGERED) == + INTERNAL_LOAD_FLAGS_NO_OPENER || + (aFlags ^ INTERNAL_LOAD_FLAGS_IS_USER_TRIGGERED) == + (INTERNAL_LOAD_FLAGS_NO_OPENER | + INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER)); MOZ_ASSERT(!aPostData); MOZ_ASSERT(!aHeadersData); // If OnLinkClickSync was invoked inside the onload handler, the load // type would be set to LOAD_NORMAL_REPLACE; otherwise it should be // LOAD_LINK. MOZ_ASSERT(aLoadType == LOAD_LINK || aLoadType == LOAD_NORMAL_REPLACE); MOZ_ASSERT(!aSHEntry);