Merge 121105

Source/WebCore/dom/NodeRareData.h

 /*
  * Copyright (C) 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 David Smith <catfish.man@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 32 matching lines @@
 namespace WebCore {
 
 class LabelsNodeList;
 class RadioNodeList;
 class TreeScope;
 
 struct NodeListsNodeData {
     WTF_MAKE_NONCOPYABLE(NodeListsNodeData); WTF_MAKE_FAST_ALLOCATED;
 public:
     template <typename StringType>
-    struct NodeListCacheMapEntryHash : public WTF::PairHash<unsigned char, StringType> {
+    struct NodeListCacheMapEntryHash {
         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;
@@ skipping 308 matching lines @@
 #endif
 
 #if ENABLE(STYLE_SCOPED)
     size_t m_numberOfScopedHTMLStyleChildren;
 #endif
 };
 
 } // namespace WebCore
 
 #endif // NodeRareData_h