From 0355845713bbd51d82009c3bd57449692a1a9b62 Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Tue, 26 Oct 2010 12:51:08 -0500
Subject: [PATCH] Bug 603680: Paper over lack of IPDL |discard| (and possible
 weirdly short-lived <browser>s). r=bsmedberg a=blocking-fennec

---
 dom/ipc/TabParent.cpp            | 3 ++-
 layout/ipc/RenderFrameParent.cpp | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index 7a828b02e63e..e5998c0535ec 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -694,7 +694,8 @@ PRenderFrameParent*
 TabParent::AllocPRenderFrame()
 {
   nsRefPtr<nsFrameLoader> frameLoader = GetFrameLoader();
-  return new RenderFrameParent(frameLoader);
+  NS_WARN_IF_FALSE(frameLoader, "'message sent to unknown actor ID' coming up");
+  return frameLoader ? new RenderFrameParent(frameLoader) : nsnull;
 }
 
 bool
diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp
index 9ca3d1c17e2c..6663902eb73e 100644
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -174,7 +174,9 @@ IsTempLayerManager(LayerManager* aManager)
 
 RenderFrameParent::RenderFrameParent(nsFrameLoader* aFrameLoader)
   : mFrameLoader(aFrameLoader)
-{}
+{
+  NS_ABORT_IF_FALSE(aFrameLoader, "Need a frameloader here");
+}
 
 RenderFrameParent::~RenderFrameParent()
 {}