Backed out 2 changesets (bug 1552168) for causing mochitest crashes on test_menubar.xul CLOSED TREE

Backed out changeset 83590619ce06 (bug 1552168) Backed out changeset 7ff83cc5d33a (bug 1552168)
2019-07-03 16:08:23 +03:00
parent 982ba81ad1
commit 21f8d052a5
32 changed files with 181 additions and 23 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -9989,7 +9989,9 @@ nsresult nsDocShell::DoURILoad(nsDocShellLoadState* aLoadState,
        true,  // aInheritForAboutBlank
        isSrcdoc);

-    inheritPrincipal = inheritAttrs && !SchemeIsData(aLoadState->URI());
+    bool isURIUniqueOrigin = nsIOService::IsDataURIUniqueOpaqueOrigin() &&
+                             SchemeIsData(aLoadState->URI());
+    inheritPrincipal = inheritAttrs && !isURIUniqueOrigin;
  }

  nsLoadFlags loadFlags = mDefaultLoadFlags;