Merge 245600 "Give QuickTime the plugin stream data in writeable..."

content/child/npapi/webplugin_delegate_impl.cc

 // Copyright (c) 2012 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 "content/child/npapi/webplugin_delegate_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/child/npapi/plugin_instance.h"
 #include "content/child/npapi/plugin_lib.h"
 #include "content/child/npapi/plugin_stream_url.h"
 #include "content/child/npapi/plugin_url_fetcher.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebCursorInfo;
 using WebKit::WebInputEvent;
 
@@ skipping 21 matching lines @@
   } else {
     delete this;
   }
 }
 
 bool WebPluginDelegateImpl::Initialize(
     const GURL& url,
     const std::vector<std::string>& arg_names,
     const std::vector<std::string>& arg_values,
     bool load_manually) {
+  if (instance_->mime_type() == "video/quicktime")
+    quirks_ |= PLUGIN_QUIRK_COPY_STREAM_DATA;
+
   instance_->set_web_plugin(plugin_);
   if (quirks_ & PLUGIN_QUIRK_DONT_ALLOW_MULTIPLE_INSTANCES) {
     PluginLib* plugin_lib = instance()->plugin_lib();
     if (plugin_lib->instance_count() > 1) {
       return false;
     }
   }
 
   int argc = 0;
   scoped_ptr<char*[]> argn(new char*[arg_names.size()]);
@@ skipping 245 matching lines @@
                                      const GURL& referrer,
                                      bool notify_redirects,
                                      bool is_plugin_src_load,
                                      int origin_pid,
                                      int render_view_id) {
   // TODO(jam): once we switch over to resource loading always happening in this
   // code path, remove WebPluginResourceClient abstraction.
   PluginStreamUrl* plugin_stream = instance()->CreateStream(
       resource_id, url, std::string(), notify_id);
 
+  bool copy_stream_data = !!(quirks_ & PLUGIN_QUIRK_COPY_STREAM_DATA);
   plugin_stream->SetPluginURLFetcher(new PluginURLFetcher(
       plugin_stream, url, first_party_for_cookies, method, buf, len,
       referrer, notify_redirects, is_plugin_src_load, origin_pid,
-      render_view_id, resource_id));
+      render_view_id, resource_id, copy_stream_data));
 }
 
 }  // namespace content