From 73efb72bbdcd7c203cb5d06209ce433d1feeddda Mon Sep 17 00:00:00 2001
From: "nrthomas%gmail.com"
 <nrthomas%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 9 Apr 2009 00:00:16 +0000
Subject: [PATCH] Bug 487345 -  Crash [@ nsObjectLoadingContent::Instantiate]
 when enabling Flashblock after visiting this URL, p=Olli.Pettay@gmail.com,
 r=bzbarsky, a=ss

git-svn-id: svn://10.0.0.236/trunk@256857 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsObjectLoadingContent.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mozilla/content/base/src/nsObjectLoadingContent.cpp b/mozilla/content/base/src/nsObjectLoadingContent.cpp
index bdfc26bd436..296bbf3f30e 100644
--- a/mozilla/content/base/src/nsObjectLoadingContent.cpp
+++ b/mozilla/content/base/src/nsObjectLoadingContent.cpp
@@ -134,7 +134,15 @@ nsAsyncInstantiateEvent::Run()
   // Also make sure that we still refer to the same data.
   nsIObjectFrame* frame = mContent->
     GetExistingFrame(nsObjectLoadingContent::eFlushContent);
-  if (mFrame.IsAlive() &&
+#ifdef DEBUG
+  if (frame && mFrame.IsAlive()) {
+    nsIFrame* objectFrame = nsnull;
+    CallQueryInterface(frame, &objectFrame);
+    NS_ASSERTION(objectFrame == mFrame.GetFrame(), "Wrong frame!");
+  }
+#endif
+  if (frame &&
+      mFrame.IsAlive() &&
       mContent->mURI == mURI &&
       mContent->mContentType.Equals(mContentType)) {
     if (LOG_ENABLED()) {