From 06ea8e899e48f1f2f396b70e63fae369f2f23232 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Mon, 28 Jun 2010 16:42:48 +0100 Subject: Merge WebKit at r61871: Initial merge by git. Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5 --- WebCore/plugins/wx/PluginDataWx.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'WebCore/plugins/wx/PluginDataWx.cpp') diff --git a/WebCore/plugins/wx/PluginDataWx.cpp b/WebCore/plugins/wx/PluginDataWx.cpp index 747c11a..a595c82 100644 --- a/WebCore/plugins/wx/PluginDataWx.cpp +++ b/WebCore/plugins/wx/PluginDataWx.cpp @@ -53,17 +53,8 @@ void PluginData::initPlugins() mime.type = it->first; mime.desc = it->second; - mime.pluginIndex = m_plugins.size(); + mime.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 += extensions[i]; - } - info.mimes.append(mime); } -- cgit v1.1