This changelist fixes some issues with the NPAPI WMP plugin work in Chrome. ...

webkit/glue/webplugin_impl.cc

 // Copyright (c) 2006-2009 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 "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/escape.h"
 #include "skia/ext/platform_canvas.h"
@@ skipping 179 matching lines @@
   WebString content_encoding =
       response.httpHeaderField(WebString::fromUTF8("Content-Encoding"));
   if (!content_encoding.isNull() &&
       !EqualsASCII(content_encoding, "identity")) {
     // Don't send the compressed content length to the plugin, which only
     // cares about the decoded length.
     response_info->expected_length = 0;
   }
 }
 
-// Utility function to convert a vector to an array of char*'s.
-// Caller is responsible to free memory with DeleteArray().
-static char** ToArray(const WebVector<WebString>& input) {
-  char** array = new char*[input.size() + 1];
-  size_t index;
-  for (index = 0; index < input.size(); ++index) {
-    const WebCString& src = input[index].utf8();
-    array[index] = new char[src.length() + 1];
-    base::strlcpy(array[index], src.data(), src.length() + 1);
-    array[index][src.length()] = '\0';
-  }
-  array[index] = 0;
-  return array;
-}
-
-static void DeleteArray(char** array) {
-  char** ptr = array;
-  while (*ptr) {
-    delete[] *ptr;
-    ++ptr;
-  }
-  delete[] array;
-}
-
 }  // namespace
 
 // WebKit::WebPlugin ----------------------------------------------------------
 
 bool WebPluginImpl::initialize(WebPluginContainer* container) {
   if (!page_delegate_)
     return false;
 
   // Get the classid and version from attributes of the object.
   std::string combined_clsid;
 #if defined(OS_WIN)
   std::string clsid, version;
   if (activex_shim::IsMimeTypeActiveX(mime_type_)) {
-    for (size_t i = 0; i < arg_count_; i++) {
-      const char* param_name = arg_names_[i];
-      const char* param_value = arg_values_[i];
+    for (size_t i = 0; i < arg_names_.size(); i++) {
+      const char* param_name = arg_names_[i].c_str();
+      const char* param_value = arg_values_[i].c_str();
       if (base::strcasecmp(param_name, "classid") == 0) {
         activex_shim::GetClsidFromClassidAttribute(param_value, &clsid);
       } else if (base::strcasecmp(param_name, "codebase") == 0) {
         version = activex_shim::GetVersionFromCodebaseAttribute(param_value);
       }
     }
 
     // Attempt to map this clsid to a known NPAPI mime type if possible, failing
     // which we attempt to load the activex shim for the clsid.
     if (!activex_shim::GetMimeTypeForClsid(clsid, &mime_type_)) {
       // We need to pass the combined clsid + version to PluginsList, so that it
       // would detect if the requested version is installed. If not, it needs
       // to use the default plugin to update the control.
       if (!version.empty())
         combined_clsid = clsid + "#" + version;
       else
         combined_clsid = clsid;
     }
   }
 #endif
 
   std::string actual_mime_type;
   WebPluginDelegate* plugin_delegate = page_delegate_->CreatePluginDelegate(
       plugin_url_, mime_type_, combined_clsid, &actual_mime_type);
   if (!plugin_delegate)
     return NULL;
 
   bool ok = plugin_delegate->Initialize(
-      plugin_url_, arg_names_, arg_values_, arg_count_, this, load_manually_);
+      plugin_url_, arg_names_, arg_values_, this, load_manually_);
   if (!ok) {
     plugin_delegate->PluginDestroyed();
     return false;
   }
 
   if (!actual_mime_type.empty())
     mime_type_ = actual_mime_type;
   delegate_ = plugin_delegate;
 
   SetContainer(container);
@@ skipping 151 matching lines @@
       window_(NULL),
       page_delegate_(page_delegate),
       webframe_(webframe),
       delegate_(NULL),
       container_(NULL),
       plugin_url_(params.url),
       load_manually_(params.loadManually),
       first_geometry_update_(true),
       ignore_response_error_(false),
       mime_type_(params.mimeType.utf8()),
-      arg_names_(ToArray(params.attributeNames)),
-      arg_values_(ToArray(params.attributeValues)),
-      arg_count_(params.attributeNames.size()),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
   DCHECK_EQ(params.attributeNames.size(), params.attributeValues.size());
   StringToLowerASCII(&mime_type_);
+
+  for (size_t i = 0; i < params.attributeNames.size(); ++i) {
+    arg_names_.push_back(params.attributeNames[i].utf8());
+    arg_values_.push_back(params.attributeValues[i].utf8());
+  }
 }
 
 WebPluginImpl::~WebPluginImpl() {
-  if (arg_names_)
-    DeleteArray(arg_names_);
-  if (arg_values_)
-    DeleteArray(arg_values_);
 }
 
 void WebPluginImpl::SetWindow(gfx::PluginWindowHandle window) {
   if (window) {
     DCHECK(!windowless_);  // Make sure not called twice.
     window_ = window;
     if (page_delegate_) {
       // Tell the view delegate that the plugin window was created, so that it
       // can create necessary container widgets.
       page_delegate_->CreatedPluginWindow(window);
@@ skipping 583 matching lines @@
   TearDownPluginInstance(loader);
 
   container_ = container_widget;
   webframe_ = webframe;
 
   std::string actual_mime_type;
   WebPluginDelegate* plugin_delegate = page_delegate_->CreatePluginDelegate(
       plugin_url_, mime_type_, std::string(), &actual_mime_type);
 
   bool ok = plugin_delegate->Initialize(
-      plugin_url_, arg_names_, arg_values_, arg_count_, this, load_manually_);
+      plugin_url_, arg_names_, arg_values_, this, load_manually_);
 
   if (!ok) {
     container_ = NULL;
     // TODO(iyengar) Should we delete the current plugin instance here?
     return false;
   }
 
   mime_type_ = actual_mime_type;
   delegate_ = plugin_delegate;
 
@@ skipping 40 matching lines @@
     client_index = clients_.erase(client_index);
   }
 
   // This needs to be called now and not in the destructor since the
   // webframe_ might not be valid anymore.
   webframe_ = NULL;
   method_factory_.RevokeAll();
 }
 
 }  // namespace webkit_glue