summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/plugins
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-06-03 12:21:06 +0100
committerSteve Block <steveblock@google.com>2011-06-08 15:04:40 +0100
commitb999e45add23dd4039ec66ff24acd14b85470657 (patch)
treec1fe0dfc45e18dc9c7b944fe0c9185c4b4e99517 /Source/WebCore/plugins
parent0c71a938bf93014d65da79a51825ee2d7941bd12 (diff)
downloadexternal_webkit-b999e45add23dd4039ec66ff24acd14b85470657.zip
external_webkit-b999e45add23dd4039ec66ff24acd14b85470657.tar.gz
external_webkit-b999e45add23dd4039ec66ff24acd14b85470657.tar.bz2
Merge WebKit at r82507: StringImpl::computeHash() removed
See http://trac.webkit.org/changeset/81563 Change-Id: Ie125edaee69cc24bc4db035773feed9bc68747a5
Diffstat (limited to 'Source/WebCore/plugins')
-rw-r--r--Source/WebCore/plugins/android/PluginPackageAndroid.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebCore/plugins/android/PluginPackageAndroid.cpp b/Source/WebCore/plugins/android/PluginPackageAndroid.cpp
index 24de122..f3849af 100644
--- a/Source/WebCore/plugins/android/PluginPackageAndroid.cpp
+++ b/Source/WebCore/plugins/android/PluginPackageAndroid.cpp
@@ -378,8 +378,7 @@ unsigned PluginPackage::hash() const
m_mimeToExtensions.size(),
};
- return StringImpl::computeHash(reinterpret_cast<const UChar*>(hashCodes),
- sizeof(hashCodes) / sizeof(UChar));
+ return StringHasher::computeHash(reinterpret_cast<const UChar*>(hashCodes), sizeof(hashCodes) / sizeof(UChar));
}
bool PluginPackage::equal(const PluginPackage& a, const PluginPackage& b)