Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

1 files changed, 3 insertions, 12 deletions

diff --git a/WebCore/plugins/qt/PluginDataQt.cpp b/WebCore/plugins/qt/PluginDataQt.cpp
index 8d4968b..3dc86d0 100644
--- a/WebCore/plugins/qt/PluginDataQt.cpp
+++ b/WebCore/plugins/qt/PluginDataQt.cpp
@@ -52,8 +52,8 @@ void PluginData::initPlugins()
                 MimeClassInfo mimeInfo;
                 mimeInfo.type = mimeType.name;
                 mimeInfo.desc = mimeType.description;
-                mimeInfo.suffixes = mimeType.fileExtensions.join(QLatin1String("; "));
-                mimeInfo.pluginIndex = m_plugins.size();
+                for (int k = 0; k < mimeType.fileExtensions.count(); ++k)
+                  mimeInfo.extensions.append(mimeType.fileExtensions.at(k));
 
                 info.mimes.append(mimeInfo);
             }
@@ -80,16 +80,7 @@ void PluginData::initPlugins()
 
             mime.type = it->first;
             mime.desc = it->second;
-            mime.pluginIndex = m_plugins.size();
-
-            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);
         }