Modified: trunk/Source/WebCore/ChangeLog (121102 => 121103)
--- trunk/Source/WebCore/ChangeLog 2012-06-23 21:23:12 UTC (rev 121102)
+++ trunk/Source/WebCore/ChangeLog 2012-06-23 21:30:30 UTC (rev 121103)
@@ -1,3 +1,21 @@
+2012-06-23 Ryosuke Niwa <[email protected]>
+
+ REGRESSION(r120979): getElementsByTagName is 12% slower
+ https://bugs.webkit.org/show_bug.cgi?id=89783
+
+ Reviewed by Darin Adler.
+
+ The problem is that hashing std::pair<unsigned short, AtomicString> is very slow compared to just hashing AtomicString,
+ which internally holds a hash already. Fixed the regression by replacing the default hash function by the one that
+ computes AtomicString's hash + list type. This is okay because we only have 7 node list types at the moment.
+
+ * dom/NodeRareData.h:
+ (NodeListsNodeData):
+ (WebCore::NodeListsNodeData::NodeListCacheMapEntryHash::hash):
+ (NodeListCacheMapEntryHash):
+ (WebCore::NodeListsNodeData::NodeListCacheMapEntryHash::equal):
+ (WebCore::NodeListsNodeData::namedNodeListKey):
+
2012-06-23 Dan Bernstein <[email protected]>
RenderText’s minimum preferred width is incorrect automatic hyphenation is used
Modified: trunk/Source/WebCore/dom/NodeRareData.h (121102 => 121103)
--- trunk/Source/WebCore/dom/NodeRareData.h 2012-06-23 21:23:12 UTC (rev 121102)
+++ trunk/Source/WebCore/dom/NodeRareData.h 2012-06-23 21:30:30 UTC (rev 121103)
@@ -49,8 +49,18 @@
class NodeListsNodeData {
WTF_MAKE_NONCOPYABLE(NodeListsNodeData); WTF_MAKE_FAST_ALLOCATED;
public:
- typedef HashMap<std::pair<unsigned short, AtomicString>, DynamicSubtreeNodeList*> NodeListAtomicNameCacheMap;
- typedef HashMap<std::pair<unsigned short, String>, DynamicSubtreeNodeList*> NodeListNameCacheMap;
+ template <typename StringType>
+ struct NodeListCacheMapEntryHash : public WTF::PairHash<unsigned char, StringType> {
+ static unsigned hash(const std::pair<unsigned char, StringType>& entry)
+ {
+ return DefaultHash<StringType>::Hash::hash(entry.second) + entry.first;
+ }
+ static bool equal(const std::pair<unsigned char, StringType>& a, const std::pair<unsigned char, StringType>& b) { return a == b; }
+ static const bool safeToCompareToEmptyOrDeleted = DefaultHash<StringType>::Hash::safeToCompareToEmptyOrDeleted;
+ };
+
+ typedef HashMap<std::pair<unsigned char, AtomicString>, DynamicSubtreeNodeList*, NodeListCacheMapEntryHash<AtomicString> > NodeListAtomicNameCacheMap;
+ typedef HashMap<std::pair<unsigned char, String>, DynamicSubtreeNodeList*, NodeListCacheMapEntryHash<String> > NodeListNameCacheMap;
typedef HashMap<QualifiedName, TagNodeList*> TagNodeListCacheNS;
template<typename T>
@@ -151,14 +161,14 @@
private:
NodeListsNodeData() { }
- std::pair<unsigned short, AtomicString> namedNodeListKey(DynamicNodeList::NodeListType listType, const AtomicString& name)
+ std::pair<unsigned char, AtomicString> namedNodeListKey(DynamicNodeList::NodeListType listType, const AtomicString& name)
{
- return std::pair<unsigned short, AtomicString>(listType, name);
+ return std::pair<unsigned char, AtomicString>(listType, name);
}
- std::pair<unsigned short, String> namedNodeListKey(DynamicNodeList::NodeListType listType, const String& name)
+ std::pair<unsigned char, String> namedNodeListKey(DynamicNodeList::NodeListType listType, const String& name)
{
- return std::pair<unsigned short, String>(listType, name);
+ return std::pair<unsigned char, String>(listType, name);
}
NodeListAtomicNameCacheMap m_atomicNameCaches;