Move caching out of LiveNodeListBase and into a new CollectionIndexCache class

Source/core/html/HTMLCollection.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
  *
  * 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.
  *
@@ skipping 20 matching lines @@
 
 namespace WebCore {
 
 class HTMLCollection : public ScriptWrappable, public RefCounted<HTMLCollection>, public LiveNodeListBase {
 public:
     static PassRefPtr<HTMLCollection> create(ContainerNode* base, CollectionType);
     virtual ~HTMLCollection();
     virtual void invalidateCache() const OVERRIDE;
 
     // DOM API
+    unsigned length() const { return m_collectionIndexCache.nodeCount(*this); }
+    Node* item(unsigned offset) const { return m_collectionIndexCache.nodeAt(*this, offset); }
     virtual Element* namedItem(const AtomicString& name) const;
 
     // Non-DOM API
     void namedItems(const AtomicString& name, Vector<RefPtr<Element> >&) const;
-    bool isEmpty() const
-    {
-        if (isLengthCacheValid())
-            return !cachedLength();
-        if (cachedItem())
-            return false;
-        return !item(0);
-    }
-    bool hasExactlyOneItem() const
-    {
-        if (isLengthCacheValid())
-            return cachedLength() == 1;
-        if (cachedItem())
-            return !cachedItemOffset() && !item(1);
-        return item(0) && !item(1);
-    }
+    bool isEmpty() const { return m_collectionIndexCache.isEmpty(*this); }
+    bool hasExactlyOneItem() const { return m_collectionIndexCache.hasExactlyOneNode(*this); }
 
     virtual Element* virtualItemAfter(Element*) const;
 
+    // CollectionIndexCache API.
     Element* traverseToFirstElement(const ContainerNode& root) const;
-    Element* traverseForwardToOffset(unsigned offset, Element& currentElement, unsigned& currentOffset, const ContainerNode& root) const;
+    Element* traverseForwardToOffset(unsigned offset, Node& currentElement, unsigned& currentOffset, const ContainerNode& root) const;
 
 protected:
     HTMLCollection(ContainerNode* base, CollectionType, ItemAfterOverrideType);
 
     virtual void updateNameCache() const;
     bool hasNameCache() const { return m_isNameCacheValid; }
     void setHasNameCache() const { m_isNameCacheValid = true; }
 
     typedef HashMap<StringImpl*, OwnPtr<Vector<Element*> > > NodeCacheMap;
     Vector<Element*>* idCache(const AtomicString& name) const { return m_idCache.get(name.impl()); }
     Vector<Element*>* nameCache(const AtomicString& name) const { return m_nameCache.get(name.impl()); }
     void appendIdCache(const AtomicString& name, Element* element) const { append(m_idCache, name, element); }
     void appendNameCache(const AtomicString& name, Element* element) const { append(m_nameCache, name, element); }
 
 private:
     bool checkForNameMatch(const Element&, bool checkName, const AtomicString& name) const;
     Element* traverseNextElement(Element& previous, const ContainerNode& root) const;
 
     static void append(NodeCacheMap&, const AtomicString&, Element*);
     void invalidateIdNameCacheMaps() const
     {
         m_idCache.clear();
         m_nameCache.clear();
         m_isNameCacheValid = false;
     }
 
     mutable unsigned m_isNameCacheValid : 1;
     mutable NodeCacheMap m_idCache;
     mutable NodeCacheMap m_nameCache;
+    mutable CollectionIndexCache<HTMLCollection> m_collectionIndexCache;
 
     friend class LiveNodeListBase;
 };
 
 } // namespace
 
 #endif