Merge 22369 - Fix plugin IPC issues....

webkit/glue/plugins/plugin_stream_url.cc

Index: webkit/glue/plugins/plugin_stream_url.cc
===================================================================
--- webkit/glue/plugins/plugin_stream_url.cc	(revision 23177)
+++ webkit/glue/plugins/plugin_stream_url.cc	(working copy)
@@ -47,16 +47,18 @@
                                          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);
   }
 }
 
@@ -65,8 +67,11 @@
   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() {
Property changes on: webkit\glue\plugins\plugin_stream_url.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/plugins/plugin_stream_url.cc:r3734-4217,4606-5108,5177-5263
   Merged /trunk/src/webkit/glue/plugins/plugin_stream_url.cc:r22369