diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/plugins/wx | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/plugins/wx')
| -rw-r--r-- | WebCore/plugins/wx/PluginDataWx.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
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<String> 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); } |