diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:56:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:57:30 +0200 |
| commit | b297e0fa5c217c9467033b7c8b46891a52870120 (patch) | |
| tree | 43fc14689295e9e64f2719d05aad94e3049f6cd7 /Source/WebCore/plugins/PluginDatabase.cpp | |
| parent | 69d517dbfa69903d8593cc1737f0474b21e3251e (diff) | |
| download | qtwebkit-b297e0fa5c217c9467033b7c8b46891a52870120.tar.gz | |
Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"
This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.
Caused OOM issues on some CI machines :(
Diffstat (limited to 'Source/WebCore/plugins/PluginDatabase.cpp')
| -rw-r--r-- | Source/WebCore/plugins/PluginDatabase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/plugins/PluginDatabase.cpp b/Source/WebCore/plugins/PluginDatabase.cpp index 4452afe1e..961c45485 100644 --- a/Source/WebCore/plugins/PluginDatabase.cpp +++ b/Source/WebCore/plugins/PluginDatabase.cpp @@ -166,7 +166,7 @@ bool PluginDatabase::refresh() MIMEToDescriptionsMap::const_iterator map_it = (*it)->mimeToDescriptions().begin(); MIMEToDescriptionsMap::const_iterator map_end = (*it)->mimeToDescriptions().end(); for (; map_it != map_end; ++map_it) - m_registeredMIMETypes.add(map_it->key); + m_registeredMIMETypes.add(map_it->first); } return true; @@ -247,9 +247,9 @@ String PluginDatabase::MIMETypeForExtension(const String& extension) const MIMEToExtensionsMap::const_iterator mime_end = (*it)->mimeToExtensions().end(); for (MIMEToExtensionsMap::const_iterator mime_it = (*it)->mimeToExtensions().begin(); mime_it != mime_end; ++mime_it) { - mimeType = mime_it->key; + mimeType = mime_it->first; PluginPackage* preferredPlugin = m_preferredPlugins.get(mimeType).get(); - const Vector<String>& extensions = mime_it->value; + const Vector<String>& extensions = mime_it->second; bool foundMapping = false; for (unsigned i = 0; i < extensions.size(); i++) { if (equalIgnoringCase(extensions[i], extension)) { @@ -339,8 +339,8 @@ void PluginDatabase::remove(PluginPackage* package) MIMEToExtensionsMap::const_iterator it = package->mimeToExtensions().begin(); MIMEToExtensionsMap::const_iterator end = package->mimeToExtensions().end(); for ( ; it != end; ++it) { - PluginPackageByNameMap::iterator packageInMap = m_preferredPlugins.find(it->key); - if (packageInMap != m_preferredPlugins.end() && packageInMap->value == package) + PluginPackageByNameMap::iterator packageInMap = m_preferredPlugins.find(it->first); + if (packageInMap != m_preferredPlugins.end() && packageInMap->second == package) m_preferredPlugins.remove(packageInMap); } |