From c7ab3acf29eb84edca2cb48630246a29eb0df794 Mon Sep 17 00:00:00 2001
From: Benjamin Smedberg <benjamin@smedbergs.us>
Date: Fri, 4 Jan 2013 09:50:43 -0500
Subject: [PATCH] Bug 559432 - Don't fail the assert if the cached actor is
 null... that probably just means we're in the process of tearing down the
 instance, r=josh

--HG--
extra : rebase_source : c7add3dc063f52127818fcdfc9b76e45ed45bf1a
---
 dom/plugins/ipc/PluginInstanceChild.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp
index 18aa8128f68..38f7e961fed 100644
--- a/dom/plugins/ipc/PluginInstanceChild.cpp
+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
@@ -264,9 +264,9 @@ PluginInstanceChild::InternalGetNPObjectForValue(NPNVariable aValue,
 
         // Make sure that the current actor returned by the parent matches our
         // cached actor!
-        NS_ASSERTION(static_cast<PluginScriptableObjectChild*>(currentActor) ==
+        NS_ASSERTION(!currentActor ||
+                     static_cast<PluginScriptableObjectChild*>(currentActor) ==
                      actor, "Cached actor is out of date!");
-        NS_ASSERTION(currentResult == result, "Results don't match?!");
     }
 #endif