From f6ed39dbc5771e36cbb5eee1c9ebc2721c83c6ab Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de"
 <cbiesinger%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 3 Oct 2005 12:55:07 +0000
Subject: [PATCH] fallback to alternate content if Instantiate() fails bug
 310515 r+sr=bz

git-svn-id: svn://10.0.0.236/trunk@181463 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsObjectLoadingContent.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mozilla/content/base/src/nsObjectLoadingContent.cpp b/mozilla/content/base/src/nsObjectLoadingContent.cpp
index c29e26f6538..6d12241b272 100644
--- a/mozilla/content/base/src/nsObjectLoadingContent.cpp
+++ b/mozilla/content/base/src/nsObjectLoadingContent.cpp
@@ -120,7 +120,10 @@ nsAsyncInstantiateEvent::HandleEvent(PLEvent* event)
                                                PL_GetEventOwner(event));
   // Make sure that we still have the right frame
   if (con->GetFrame() == ev->mFrame) {
-    ev->mFrame->Instantiate(ev->mContentType.get(), ev->mURI);
+    nsresult rv = ev->mFrame->Instantiate(ev->mContentType.get(), ev->mURI);
+    if (NS_FAILED(rv)) {
+      con->Fallback(PR_TRUE);
+    }
   }
   return nsnull;
 }
@@ -801,7 +804,6 @@ nsObjectLoadingContent::ObjectURIChanged(nsIURI* aURI,
 
   mInstantiating = PR_FALSE;
 
-  // XXX should this use current doc, or owner doc?
   nsCOMPtr<nsILoadGroup> group = doc->GetDocumentLoadGroup();
   nsCOMPtr<nsIChannel> chan;
   rv = NS_NewChannel(getter_AddRefs(chan), aURI, nsnull, group, this);