Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

1 files changed, 6 insertions, 4 deletions

diff --git a/WebCore/plugins/PluginData.h b/WebCore/plugins/PluginData.h
index 1055afb..f4cc62f 100644
--- a/WebCore/plugins/PluginData.h
+++ b/WebCore/plugins/PluginData.h
@@ -32,13 +32,12 @@ struct PluginInfo;
 struct MimeClassInfo {
     String type;
     String desc;
-    String suffixes;
-    unsigned pluginIndex;
+    Vector<String> extensions;
 };
 
 inline bool operator==(const MimeClassInfo& a, const MimeClassInfo& b)
 {
-    return a.type == b.type && a.desc == b.desc && a.suffixes == b.suffixes && a.pluginIndex == b.pluginIndex;
+    return a.type == b.type && a.desc == b.desc && a.extensions == b.extensions;
 }
 
 struct PluginInfo {
@@ -58,7 +57,8 @@ public:
 
     const Vector<PluginInfo>& plugins() const { return m_plugins; }
     const Vector<MimeClassInfo>& mimes() const { return m_mimes; }
-
+    const Vector<size_t>& mimePluginIndices() const { return m_mimePluginIndices; }
+    
     bool supportsMimeType(const String& mimeType) const;
     String pluginNameForMimeType(const String& mimeType) const;
 
@@ -70,6 +70,8 @@ private:
 
     Vector<PluginInfo> m_plugins;
     Vector<MimeClassInfo> m_mimes;
+    Vector<size_t> m_mimePluginIndices;
+    
     const Page* m_page;
 };