Another attempt at landing this patch.

The reliability tests regressions caused by this patch have been addressed by the upstream
bug fix https://bugs.webkit.org/show_bug.cgi?id=27769

The IPCs for carrying data requested by plugins have been changed from
synchronous IPCs to asynchronous IPCs. 

This fixes bug http://code.google.com/p/chromium/issues/detail?id=14323, where
the Flash plugin would not render
content on the page if these IPCs were processed while the plugin waited for
sync calls like NPN_Evaluate to
return.

Test=covered by UI tests.

Bug=14323

Review URL: http://codereview.chromium.org/160338

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22041 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 3 deletions

diff --git a/webkit/glue/plugins/plugin_stream_url.cc b/webkit/glue/plugins/plugin_stream_url.cc
index b050411..53d1019 100644
--- a/webkit/glue/plugins/plugin_stream_url.cc
+++ b/webkit/glue/plugins/plugin_stream_url.cc
@@ -44,16 +44,15 @@ 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;
   }
 }