Merge 22369 - Fix plugin IPC issues....

webkit/glue/plugins/plugin_stream_url.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 #include "config.h"
 
 #include "webkit/glue/plugins/plugin_stream_url.h"
 
 #include "webkit/glue/glue_util.h"
@@ skipping 29 matching lines @@
 
 void PluginStreamUrl::WillSendRequest(const GURL& url) {
   url_ = url;
   UpdateUrl(url.spec().c_str());
 }
 
 void PluginStreamUrl::DidReceiveResponse(const std::string& mime_type,
                                          const std::string& headers,
                                          uint32 expected_length,
                                          uint32 last_modified,
-                                         bool request_is_seekable,
-                                         bool* cancel) {
+                                         bool request_is_seekable) {
   bool opened = Open(mime_type,
                      headers,
                      expected_length,
                      last_modified,
                      request_is_seekable);
   if (!opened) {
+    CancelRequest();
     instance()->RemoveStream(this);
-    *cancel = true;
+  } else {
+    if (id_ > 0)
+      instance()->webplugin()->SetDeferResourceLoading(id_, false);
   }
 }
 
 void PluginStreamUrl::DidReceiveData(const char* buffer, int length,
                                      int data_offset) {
   if (!open())
     return;
 
-  if (length > 0)
+  if (length > 0) {
     Write(const_cast<char*>(buffer), length, data_offset);
+    if (id_ > 0)
+      instance()->webplugin()->SetDeferResourceLoading(id_, false);
+  }
 }
 
 void PluginStreamUrl::DidFinishLoading() {
   if (!seekable()) {
     Close(NPRES_DONE);
   }
 }
 
 void PluginStreamUrl::DidFail() {
   Close(NPRES_NETWORK_ERR);
 }
 
 void PluginStreamUrl::CancelRequest() {
   if (id_ > 0) {
     if (instance()->webplugin()) {
       instance()->webplugin()->CancelResource(id_);
     }
     id_ = 0;
   }
 }
 
 } // namespace NPAPI