From 5af96e2c7b73ebc627c6894727826a7576d31758 Mon Sep 17 00:00:00 2001 From: Leon Clarke Date: Thu, 3 Jun 2010 14:33:32 +0100 Subject: Merge webkit.org at r60469 : Initial merge by git. Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234 --- WebCore/plugins/wx/PluginDataWx.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'WebCore/plugins/wx') diff --git a/WebCore/plugins/wx/PluginDataWx.cpp b/WebCore/plugins/wx/PluginDataWx.cpp index 58ee315..747c11a 100644 --- a/WebCore/plugins/wx/PluginDataWx.cpp +++ b/WebCore/plugins/wx/PluginDataWx.cpp @@ -39,31 +39,32 @@ void PluginData::initPlugins() const Vector &plugins = db->plugins(); for (unsigned int i = 0; i < plugins.size(); ++i) { - PluginInfo* info = new PluginInfo; + PluginInfo info; PluginPackage* package = plugins[i]; - info->name = package->name(); - info->file = package->fileName(); - info->desc = package->description(); + info.name = package->name(); + info.file = package->fileName(); + info.desc = package->description(); const MIMEToDescriptionsMap& mimeToDescriptions = package->mimeToDescriptions(); MIMEToDescriptionsMap::const_iterator end = mimeToDescriptions.end(); for (MIMEToDescriptionsMap::const_iterator it = mimeToDescriptions.begin(); it != end; ++it) { - MimeClassInfo* mime = new MimeClassInfo; - info->mimes.append(mime); + MimeClassInfo mime; - mime->type = it->first; - mime->desc = it->second; - mime->plugin = info; + mime.type = it->first; + mime.desc = it->second; + mime.pluginIndex = m_plugins.size(); - Vector extensions = package->mimeToExtensions().get(mime->type); + Vector extensions = package->mimeToExtensions().get(mime.type); for (unsigned i = 0; i < extensions.size(); i++) { if (i > 0) - mime->suffixes += ","; + mime.suffixes += ","; - mime->suffixes += extensions[i]; + mime.suffixes += extensions[i]; } + + info.mimes.append(mime); } m_plugins.append(info); -- cgit v1.1