Code drop from //branches/cupcake/...@124589

1 files changed, 14 insertions, 3 deletions

diff --git a/WebCore/loader/NetscapePlugInStreamLoader.cpp b/WebCore/loader/NetscapePlugInStreamLoader.cpp
index 47c9599..e12ed07 100644
--- a/WebCore/loader/NetscapePlugInStreamLoader.cpp
+++ b/WebCore/loader/NetscapePlugInStreamLoader.cpp
@@ -46,7 +46,7 @@ NetscapePlugInStreamLoader::~NetscapePlugInStreamLoader()
 
 PassRefPtr<NetscapePlugInStreamLoader> NetscapePlugInStreamLoader::create(Frame* frame, NetscapePlugInStreamLoaderClient* client)
 {
-    return new NetscapePlugInStreamLoader(frame, client);
+    return adoptRef(new NetscapePlugInStreamLoader(frame, client));
 }
 
 bool NetscapePlugInStreamLoader::isDone() const
@@ -76,7 +76,13 @@ void NetscapePlugInStreamLoader::didReceiveResponse(const ResourceResponse& resp
     if (!m_client)
         return;
 
-    if (response.isHTTP() && (response.httpStatusCode() < 100 || response.httpStatusCode() >= 400))
+    if (!response.isHTTP())
+        return;
+    
+    if (m_client->wantsAllStreams())
+        return;
+    
+    if (response.httpStatusCode() < 100 || response.httpStatusCode() >= 400)
         didCancel(frameLoader()->fileDoesNotExistError(response));
 }
 
@@ -111,8 +117,13 @@ void NetscapePlugInStreamLoader::didCancel(const ResourceError& error)
 {
     RefPtr<NetscapePlugInStreamLoader> protect(this);
 
-    m_documentLoader->removePlugInStreamLoader(this);
     m_client->didFail(this, error);
+
+    // We need to remove the stream loader after the call to didFail, since didFail can 
+    // spawn a new run loop and if the loader has been removed it won't be deferred when
+    // the document loader is asked to defer loading.
+    m_documentLoader->removePlugInStreamLoader(this);
+
     ResourceLoader::didCancel(error);
 }