summaryrefslogtreecommitdiffstats
path: root/WebCore/plugins
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-06-30 20:53:48 +0100
committerKristian Monsen <kristianm@google.com>2010-07-02 10:29:57 +0100
commit970d7cef781d3c9acbeb98f8c7038531a42e0ab8 (patch)
tree3ce0aa5c79124b732d5c81a554a9b393c7d179fe /WebCore/plugins
parentccb5a79614e295dfefe24149ecc73f46e8bff0e7 (diff)
downloadexternal_webkit-970d7cef781d3c9acbeb98f8c7038531a42e0ab8.zip
external_webkit-970d7cef781d3c9acbeb98f8c7038531a42e0ab8.tar.gz
external_webkit-970d7cef781d3c9acbeb98f8c7038531a42e0ab8.tar.bz2
Merge WebKit at r61871: Refactoring of MimeClassInfo class.
http://trac.webkit.org/changeset/61168 String suffixes changed to Vector<String> extensions http://trac.webkit.org/changeset/61150 pluginIndex removed Change-Id: I8e81d95da1a6795beb94247102317cf9b449979f
Diffstat (limited to 'WebCore/plugins')
-rw-r--r--WebCore/plugins/android/PluginDataAndroid.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/WebCore/plugins/android/PluginDataAndroid.cpp b/WebCore/plugins/android/PluginDataAndroid.cpp
index 69b4a0a..f46f0f6 100644
--- a/WebCore/plugins/android/PluginDataAndroid.cpp
+++ b/WebCore/plugins/android/PluginDataAndroid.cpp
@@ -52,16 +52,7 @@ void PluginData::initPlugins()
MimeClassInfo mime;
mime.type = it->first;
mime.desc = it->second;
- mime.pluginIndex = i;
-
- 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];
- }
+ mime.extensions = package->mimeToExtensions().get(mime.type);
info.mimes.append(mime);
}