changeset:   312039:4290826b078c
  user:        Timothy Nikkel <tnikkel@gmail.com>
  Date:        Fri May 13 06:09:38 2016 +0200
  summary:     Bug 1261230. r=mats, a=ritu

diff -r 45a59425b498 -r 4290826b078c layout/generic/nsSubDocumentFrame.cpp
--- a/layout/generic/nsSubDocumentFrame.cpp	Tue May 10 14:12:20 2016 +0200
+++ b/layout/generic/nsSubDocumentFrame.cpp	Fri May 13 06:09:38 2016 +0200
@@ -132,6 +132,7 @@
     nsCOMPtr<nsIDocument> oldContainerDoc;
     nsView* detachedViews =
       frameloader->GetDetachedSubdocView(getter_AddRefs(oldContainerDoc));
+    frameloader->SetDetachedSubdocView(nullptr, nullptr);
     if (detachedViews) {
       if (oldContainerDoc == aContent->OwnerDoc()) {
         // Restore stashed presentation.
@@ -142,7 +143,6 @@
         frameloader->Hide();
       }
     }
-    frameloader->SetDetachedSubdocView(nullptr, nullptr);
   }
 
   nsContentUtils::AddScriptRunner(new AsyncFrameInit(this));
@@ -936,13 +936,16 @@
     if (!mPresShell->IsDestroying()) {
       mPresShell->FlushPendingNotifications(Flush_Frames);
     }
+
+    // Either the frame has been constructed by now, or it never will be,
+    // either way we want to clear the stashed views.
+    mFrameLoader->SetDetachedSubdocView(nullptr, nullptr);
+
     nsSubDocumentFrame* frame = do_QueryFrame(mFrameElement->GetPrimaryFrame());
     if ((!frame && mHideViewerIfFrameless) ||
         mPresShell->IsDestroying()) {
       // Either the frame element has no nsIFrame or the presshell is being
-      // destroyed. Hide the nsFrameLoader, which destroys the presentation,
-      // and clear our references to the stashed presentation.
-      mFrameLoader->SetDetachedSubdocView(nullptr, nullptr);
+      // destroyed. Hide the nsFrameLoader, which destroys the presentation.
       mFrameLoader->Hide();
     }
     return NS_OK;
@@ -968,7 +971,7 @@
   // Detach the subdocument's views and stash them in the frame loader.
   // We can then reattach them if we're being reframed (for example if
   // the frame has been made position:fixed).
-  nsFrameLoader* frameloader = FrameLoader();
+  RefPtr<nsFrameLoader> frameloader = FrameLoader();
   if (frameloader) {
     nsView* detachedViews = ::BeginSwapDocShellsForViews(mInnerView->GetFirstChild());
     frameloader->SetDetachedSubdocView(detachedViews, mContent->OwnerDoc());
@@ -977,7 +980,7 @@
     // safely determine whether the frame is being reframed or destroyed.
     nsContentUtils::AddScriptRunner(
       new nsHideViewer(mContent,
-                       mFrameLoader,
+                       frameloader,
                        PresContext()->PresShell(),
                        (mDidCreateDoc || mCallingShow)));
   }
<td><span title='2017-05-12 13:47:26 +0200'>2017-05-12</span></td><td><a href='/guix/commit/gnu/packages/cryptsetup.scm?id=ae836e513e366744aa57fcb0104ffc95e47080ad'>gnu: cryptsetup: Update to 1.7.5.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2017-05-11 23:51:53 +0200'>2017-05-11</span></td><td><a href='/guix/commit/gnu/packages/cryptsetup.scm?id=2253477e6f33224473451641573d78d430e7ecdf'>gnu: cryptsetup-static: Fix FTBFS with lvm2-static@2.02.171.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2017-03-15 22:19:39 +0100'>2017-03-15</span></td><td><a href='/guix/commit/gnu/packages/cryptsetup.scm?id=618e4bfbad0740c4addc9e88d9667d5dc65b0bce'>gnu: cryptsetup: Update to 1.7.4.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2016-11-22 23:45:01 +0100'>2016-11-22</span></td><td><a href='/guix/commit/gnu/packages/cryptsetup.scm?id=106b389e525f93a56bd1d25fd33eecbd552a8c93'>gnu: Add 'cryptsetup-static'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-11-15 09:45:37 +0200'>2016-11-15</span></td><td><a href='/guix/commit/gnu/packages/cryptsetup.scm?id=336f830961f2a696c4fb7c602e1e378afcd28046'>gnu: cryptsetup: Update to 1.7.3.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2016-10-04 10:24:46 -0400'>2016-10-04</span></td><td><a href='/guix/commit/gnu/packages/cryptsetup.scm?id=491dbac41579838031d8a4910b05bdd33030dc87'>gnu: cryptsetup: Update to 1.7.2.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>