[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kbalazs at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit dbaa8fe675779f9009e3a233369c71679694c67a
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 21 15:51:05 2010 +0000

    2010-10-21  Balazs Kelemen  <kbalazs at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] PluginInfoStore does not set up mime types for plugins
            https://bugs.webkit.org/show_bug.cgi?id=48063
    
            * UIProcess/Plugins/qt/PluginInfoStoreQt.cpp:
            (WebKit::PluginInfoStore::getPluginInfo): Store the mime types
            that are supported by the plugin into the plugin argument.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70237 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b5f8225..5904011 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-21  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] PluginInfoStore does not set up mime types for plugins
+        https://bugs.webkit.org/show_bug.cgi?id=48063
+
+        * UIProcess/Plugins/qt/PluginInfoStoreQt.cpp:
+        (WebKit::PluginInfoStore::getPluginInfo): Store the mime types
+        that are supported by the plugin into the plugin argument.
+
 2010-10-21  Juha Savolainen  <juha.savolainen at weego.fi>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp b/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
index 3e50da0..25dc0f7 100644
--- a/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
+++ b/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
@@ -72,11 +72,12 @@ bool PluginInfoStore::getPluginInfo(const String& pluginPath, Plugin& plugin)
 
     const MIMEToDescriptionsMap& descriptions = package->mimeToDescriptions();
     const MIMEToExtensionsMap& extensions = package->mimeToExtensions();
-    Vector<MimeClassInfo> mimes(descriptions.size());
     MIMEToDescriptionsMap::const_iterator descEnd = descriptions.end();
+    plugin.info.mimes.reserveCapacity(descriptions.size());
     unsigned i = 0;
     for (MIMEToDescriptionsMap::const_iterator it = descriptions.begin(); it != descEnd; ++it) {
-        MimeClassInfo& mime = mimes[i++];
+        plugin.info.mimes.uncheckedAppend(MimeClassInfo());
+        MimeClassInfo& mime = plugin.info.mimes[i++];
         mime.type = it->first;
         mime.desc = it->second;
         MIMEToExtensionsMap::const_iterator extensionIt = extensions.find(it->first);

-- 
WebKit Debian packaging