summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-30 23:11:43 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-30 23:11:43 +0200
commit71e6952456e044fef8cd4ab2e1d1b972011a051e (patch)
treec4b5e1230b13f243dfabcbffd26683dd29b8a974 /dom
parentd9abe50072f85d9e890026938d947ebb5e452c65 (diff)
downloadUXP-71e6952456e044fef8cd4ab2e1d1b972011a051e.tar
UXP-71e6952456e044fef8cd4ab2e1d1b972011a051e.tar.gz
UXP-71e6952456e044fef8cd4ab2e1d1b972011a051e.tar.lz
UXP-71e6952456e044fef8cd4ab2e1d1b972011a051e.tar.xz
UXP-71e6952456e044fef8cd4ab2e1d1b972011a051e.zip
Bug 1341754: Provide a valid triggeringPrincipal when calling SetURI in Location
Diffstat (limited to 'dom')
-rw-r--r--dom/base/nsGlobalWindow.cpp9
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.