diff options
author | Moonchild <mcwerewolf@gmail.com> | 2018-05-01 09:53:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-01 09:53:46 +0200 |
commit | ae45e61da06ba989fcbb856183d9578d4d4f51ed (patch) | |
tree | 5c7dea17ce684c1cce57011ef487370c22d0e677 /dom/base/nsGlobalWindow.cpp | |
parent | fefce8f7ccbc476cfc46e61b01eff069346d3c73 (diff) | |
parent | cc4036a9cd56d504667c07fe215e61b22ab0e1f4 (diff) | |
download | UXP-ae45e61da06ba989fcbb856183d9578d4d4f51ed.tar UXP-ae45e61da06ba989fcbb856183d9578d4d4f51ed.tar.gz UXP-ae45e61da06ba989fcbb856183d9578d4d4f51ed.tar.lz UXP-ae45e61da06ba989fcbb856183d9578d4d4f51ed.tar.xz UXP-ae45e61da06ba989fcbb856183d9578d4d4f51ed.zip |
Merge pull request #311 from janekptacijarabaci/security_blocking_data_2
Use asyncOpen2() for docshell loads
Diffstat (limited to 'dom/base/nsGlobalWindow.cpp')
-rw-r--r-- | dom/base/nsGlobalWindow.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index 738703ef1..4ffccde9d 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -2521,8 +2521,13 @@ nsGlobalWindow::WouldReuseInnerWindow(nsIDocument* aNewDocument) return false; } - NS_ASSERTION(NS_IsAboutBlank(mDoc->GetDocumentURI()), - "How'd this happen?"); +#ifdef DEBUG +{ + nsCOMPtr<nsIURI> uri; + mDoc->GetDocumentURI()->CloneIgnoringRef(getter_AddRefs(uri)); + NS_ASSERTION(NS_IsAboutBlank(uri), "How'd this happen?"); +} +#endif // Great, we're the original document, check for one of the other // conditions. |