Backed out changeset 436ecd081ffa (bug 1401379)

2017-10-02 19:57:06 +02:00
parent 4b193ecf70
commit bb0fba471e
2 changed files with 3 additions and 0 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -5980,6 +5980,7 @@ nsDocShell::Destroy()

  if (mScriptGlobal) {
    mScriptGlobal->DetachFromDocShell();
+    mScriptGlobal = nullptr;
  }

  if (mSessionHistory) {
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -3601,6 +3601,8 @@ nsGlobalWindow::DetachFromDocShell()
    mContext = nullptr;
  }

+  mDocShell = nullptr; // Weak Reference
+
  NS_ASSERTION(!mNavigator, "Non-null mNavigator in outer window!");

  if (mFrames) {