Bug 1312609. r=smaug a=abillings

2016-11-29 15:15:35 -06:00
parent da2ababc5a
commit 2732a3071a
1 changed files with 2 additions and 0 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -8917,6 +8917,8 @@ nsDocShell::RestoreFromHistory()
    nsSubDocumentFrame* subDocFrame =
      do_QueryFrame(container->GetPrimaryFrame());
    rootViewParent = subDocFrame ? subDocFrame->EnsureInnerView() : nullptr;
+  } else {
+    rootViewParent = nullptr;
  }
  if (sibling &&
      sibling->GetShell() &&