Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/WebKit/gtk/webkit/webkitwebplugin.cpp b/Source/WebKit/gtk/webkit/webkitwebplugin.cpp
index e03b1ea6d..01d0bb5f2 100644
--- a/Source/WebKit/gtk/webkit/webkitwebplugin.cpp
+++ b/Source/WebKit/gtk/webkit/webkitwebplugin.cpp
@@ -237,10 +237,10 @@ GSList* webkit_web_plugin_get_mimetypes(WebKitWebPlugin* plugin)
 
     for (MIMEToDescriptionsMap::const_iterator it = mimeToDescriptions.begin(); it != end; ++it) {
         WebKitWebPluginMIMEType* mimeType = g_slice_new0(WebKitWebPluginMIMEType);
-        mimeType->name = g_strdup(it->first.utf8().data());
-        mimeType->description = g_strdup(it->second.utf8().data());
+        mimeType->name = g_strdup(it->key.utf8().data());
+        mimeType->description = g_strdup(it->value.utf8().data());
 
-        Vector<String> extensions = priv->corePlugin->mimeToExtensions().get(it->first);
+        Vector<String> extensions = priv->corePlugin->mimeToExtensions().get(it->key);
         mimeType->extensions = static_cast<gchar**>(g_malloc0(sizeof(char*) * (extensions.size() + 1)));
         for (unsigned i = 0; i < extensions.size(); i++)
             mimeType->extensions[i] = g_strdup(extensions[i].utf8().data());