Revert "Simplify DocumentOrderedMap"

Source/core/dom/DocumentOrderedMap.h

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef DocumentOrderedMap_h
 #define DocumentOrderedMap_h
 
 #include "wtf/HashCountedSet.h"
 #include "wtf/HashMap.h"
-#include "wtf/Vector.h"
 #include "wtf/text/StringImpl.h"
 
 namespace WebCore {
 
 class Element;
 class TreeScope;
 
 class DocumentOrderedMap {
 public:
     void add(StringImpl*, Element*);
     void remove(StringImpl*, Element*);
     void clear();
 
     bool contains(StringImpl*) const;
-    bool containsSingle(StringImpl*) const;
     bool containsMultiple(StringImpl*) const;
-
     // concrete instantiations of the get<>() method template
     Element* getElementById(StringImpl*, const TreeScope*) const;
-    Element* getElementByName(StringImpl*, const TreeScope*) const;
     Element* getElementByMapName(StringImpl*, const TreeScope*) const;
     Element* getElementByLowercasedMapName(StringImpl*, const TreeScope*) const;
     Element* getElementByLabelForAttribute(StringImpl*, const TreeScope*) const;
 
-    const Vector<Element*>* getAllElementsById(StringImpl*, const TreeScope*) const;
-
     void checkConsistency() const;
 
 private:
     template<bool keyMatches(StringImpl*, Element*)> Element* get(StringImpl*, const TreeScope*) const;
 
-    struct MapEntry {
-        MapEntry()
-            : element(0)
-            , count(0)
-        {
-        }
-        explicit MapEntry(Element* firstElement)
-            : element(firstElement)
-            , count(1)
-        {
-        }
+    typedef HashMap<StringImpl*, Element*> Map;
 
-        Element* element;
-        unsigned count;
-        Vector<Element*> orderedList;
-    };
-
-    typedef HashMap<StringImpl*, MapEntry> Map;
-
+    // We maintain the invariant that m_duplicateCounts is the count of all elements with a given key
+    // excluding the one referenced in m_map, if any. This means it one less than the total count
+    // when the first node with a given key is cached, otherwise the same as the total count.
     mutable Map m_map;
+    mutable HashCountedSet<StringImpl*> m_duplicateCounts;
 };
 
-inline bool DocumentOrderedMap::containsSingle(StringImpl* id) const
-{
-    Map::const_iterator it = m_map.find(id);
-    return it != m_map.end() && it->value.count == 1;
-}
-
 inline bool DocumentOrderedMap::contains(StringImpl* id) const
 {
-    return m_map.contains(id);
+    return m_map.contains(id) || m_duplicateCounts.contains(id);
 }
 
 inline bool DocumentOrderedMap::containsMultiple(StringImpl* id) const
 {
-    Map::const_iterator it = m_map.find(id);
-    return it != m_map.end() && it->value.count > 1;
+    return m_duplicateCounts.contains(id);
 }
 
 } // namespace WebCore
 
 #endif // DocumentOrderedMap_h