Make sure named item cache is always valid HTMLCollection::updateIdNameCache()

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.
  * Copyright (C) 2014 Samsung Electronics. 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 49 matching lines @@
     bool canTraverseBackward() const { return !overridesItemAfter(); }
     Element* itemBefore(const Element* previousItem) const;
     Element* traverseToFirstElement() const;
     Element* traverseForwardToOffset(unsigned offset, Element& currentElement, unsigned& currentOffset) const;
 
 protected:
     HTMLCollection(ContainerNode& base, CollectionType, ItemAfterOverrideType);
 
     class NamedItemCache {
     public:
+        static PassOwnPtr<NamedItemCache> create()
+        {
+            return adoptPtr(new NamedItemCache);
+        }
+
         Vector<Element*>* getElementsById(const AtomicString& id) const { return m_idCache.get(id.impl()); }
         Vector<Element*>* getElementsByName(const AtomicString& name) const { return m_nameCache.get(name.impl()); }
         void addElementWithId(const AtomicString& id, Element* element) { addElementToMap(m_idCache, id, element); }
         void addElementWithName(const AtomicString& name, Element* element) { addElementToMap(m_nameCache, name, element); }
 
     private:
+        NamedItemCache() { }

[eseidel, 2014/04/08 02:12:55]

Best to put all functions in the .cpp file when possible.  Just less code for
the linker to need to de-dupe.

[Inactive, 2014/04/08 02:21:08]

Done.

         typedef HashMap<StringImpl*, OwnPtr<Vector<Element*> > > StringToElementsMap;
         static void addElementToMap(StringToElementsMap& map, const AtomicString& key, Element* element)
         {
             OwnPtr<Vector<Element*> >& vector = map.add(key.impl(), nullptr).storedValue->value;
             if (!vector)
                 vector = adoptPtr(new Vector<Element*>);
             vector->append(element);
         }
 
         StringToElementsMap m_idCache;
         StringToElementsMap m_nameCache;
     };
 
     bool overridesItemAfter() const { return m_overridesItemAfter; }
     virtual Element* virtualItemAfter(Element*) const;
     bool shouldOnlyIncludeDirectChildren() const { return m_shouldOnlyIncludeDirectChildren; }
     virtual void supportedPropertyNames(Vector<String>& names);
 
     virtual void updateIdNameCache() const;
     bool hasValidIdNameCache() const { return m_namedItemCache; }
 
-    NamedItemCache& createNamedItemCache() const
+    void setNamedItemCache(PassOwnPtr<NamedItemCache> cache) const
     {
         ASSERT(!m_namedItemCache);
         document().incrementNodeListWithIdNameCacheCount();
-        m_namedItemCache = adoptPtr(new NamedItemCache);
-        return *m_namedItemCache;
+        m_namedItemCache = cache;
     }
+
     NamedItemCache& namedItemCache() const
     {
         ASSERT(m_namedItemCache);
         return *m_namedItemCache;
     }
 
 private:
     Element* traverseNextElement(Element& previous) const;
 
     void invalidateIdNameCacheMaps(Document* oldDocument = 0) const
@@ skipping 19 matching lines @@
     const unsigned m_shouldOnlyIncludeDirectChildren : 1;
     mutable OwnPtr<NamedItemCache> m_namedItemCache;
     mutable CollectionIndexCache<HTMLCollection, Element> m_collectionIndexCache;
 
     friend class LiveNodeListBase;
 };
 
 } // namespace
 
 #endif