Oilpan: move LiveNodeList collections to the heap.

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 15 matching lines @@
 
 #include "core/dom/LiveNodeListBase.h"
 #include "core/html/CollectionIndexCache.h"
 #include "core/html/CollectionType.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
-class HTMLCollection : public ScriptWrappable, public RefCounted<HTMLCollection>, public LiveNodeListBase {
+class HTMLCollection : public RefCountedWillBeGarbageCollectedFinalized<HTMLCollection>, public ScriptWrappable, public LiveNodeListBase {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLCollection);
 public:
     enum ItemAfterOverrideType {
         OverridesItemAfter,
         DoesNotOverrideItemAfter,
     };
 
-    static PassRefPtr<HTMLCollection> create(ContainerNode& base, CollectionType);
+    static PassRefPtrWillBeRawPtr<HTMLCollection> create(ContainerNode& base, CollectionType);
     virtual ~HTMLCollection();
     virtual void invalidateCache(Document* oldDocument = 0) const OVERRIDE;
     void invalidateCacheForAttribute(const QualifiedName*) const;
 
     // DOM API
     unsigned length() const { return m_collectionIndexCache.nodeCount(*this); }
     Element* item(unsigned offset) const { return m_collectionIndexCache.nodeAt(*this, offset); }
     virtual Element* namedItem(const AtomicString& name) const;
     bool namedPropertyQuery(const AtomicString&, ExceptionState&);
     void namedPropertyEnumerator(Vector<String>& names, ExceptionState&);
 
     // Non-DOM API
-    void namedItems(const AtomicString& name, Vector<RefPtr<Element> >&) const;
+    void namedItems(const AtomicString& name, WillBeHeapVector<RefPtrWillBeMember<Element> >&) const;
     bool isEmpty() const { return m_collectionIndexCache.isEmpty(*this); }
     bool hasExactlyOneItem() const { return m_collectionIndexCache.hasExactlyOneNode(*this); }
 
     // CollectionIndexCache API.
     bool canTraverseBackward() const { return !overridesItemAfter(); }
     Element* traverseToFirstElement() const;
     Element* traverseToLastElement() const;
     Element* traverseForwardToOffset(unsigned offset, Element& currentElement, unsigned& currentOffset) const;
     Element* traverseBackwardToOffset(unsigned offset, Element& currentElement, unsigned& currentOffset) const;
 
+    virtual void trace(Visitor*);
+
 protected:
     HTMLCollection(ContainerNode& base, CollectionType, ItemAfterOverrideType);
 
-    class NamedItemCache {
+    class NamedItemCache FINAL : public NoBaseWillBeGarbageCollected<NamedItemCache> {
     public:
-        static PassOwnPtr<NamedItemCache> create()
+        static PassOwnPtrWillBeRawPtr<NamedItemCache> create()
         {
-            return adoptPtr(new NamedItemCache);
+            return adoptPtrWillBeNoop(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()); }
+        WillBeHeapVector<RawPtrWillBeMember<Element> >* getElementsById(const AtomicString& id) const { return m_idCache.get(id.impl()); }
+        WillBeHeapVector<RawPtrWillBeMember<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); }
 
+        void trace(Visitor* visitor)
+        {
+            visitor->trace(m_idCache);
+            visitor->trace(m_nameCache);
+        }
+
     private:
         NamedItemCache();
-        typedef HashMap<StringImpl*, OwnPtr<Vector<Element*> > > StringToElementsMap;
+        typedef WillBeHeapHashMap<StringImpl*, OwnPtrWillBeMember<WillBeHeapVector<RawPtrWillBeMember<Element> > > > StringToElementsMap;
         static void addElementToMap(StringToElementsMap& map, const AtomicString& key, Element* element)
         {
-            OwnPtr<Vector<Element*> >& vector = map.add(key.impl(), nullptr).storedValue->value;
+            OwnPtrWillBeMember<WillBeHeapVector<RawPtrWillBeMember<Element> > >& vector = map.add(key.impl(), nullptr).storedValue->value;
             if (!vector)
-                vector = adoptPtr(new Vector<Element*>);
+                vector = adoptPtrWillBeNoop(new WillBeHeapVector<RawPtrWillBeMember<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; }
 
-    void setNamedItemCache(PassOwnPtr<NamedItemCache> cache) const
+    void setNamedItemCache(PassOwnPtrWillBeRawPtr<NamedItemCache> cache) const
     {
         ASSERT(!m_namedItemCache);
+#if ENABLE(OILPAN)
+        document().incrementNodeListWithIdNameCacheCount(this);
+#else
         document().incrementNodeListWithIdNameCacheCount();
+#endif
         m_namedItemCache = cache;
     }
 
     NamedItemCache& namedItemCache() const
     {
         ASSERT(m_namedItemCache);
         return *m_namedItemCache;
     }
 
 private:
     Element* traverseNextElement(Element& previous) const;
 
     void invalidateIdNameCacheMaps(Document* oldDocument = 0) const
     {
         if (!hasValidIdNameCache())
             return;
 
         // Make sure we decrement the NodeListWithIdNameCache count from
         // the old document instead of the new one in the case the collection
         // is moved to a new document.
         unregisterIdNameCacheFromDocument(oldDocument ? *oldDocument : document());
 
         m_namedItemCache.clear();
     }
 
     void unregisterIdNameCacheFromDocument(Document& document) const
     {
         ASSERT(hasValidIdNameCache());
+#if ENABLE(OILPAN)
+        document.decrementNodeListWithIdNameCacheCount(this);
+#else
         document.decrementNodeListWithIdNameCacheCount();
+#endif
     }
 
     const unsigned m_overridesItemAfter : 1;
     const unsigned m_shouldOnlyIncludeDirectChildren : 1;
-    mutable OwnPtr<NamedItemCache> m_namedItemCache;
+    mutable OwnPtrWillBeMember<NamedItemCache> m_namedItemCache;
     mutable CollectionIndexCache<HTMLCollection, Element> m_collectionIndexCache;
 };
 
 DEFINE_TYPE_CASTS(HTMLCollection, LiveNodeListBase, collection, isHTMLCollectionType(collection->type()), isHTMLCollectionType(collection.type()));
 
 inline void HTMLCollection::invalidateCacheForAttribute(const QualifiedName* attrName) const
 {
     if (!attrName || shouldInvalidateTypeOnAttributeChange(invalidationType(), *attrName))
         invalidateCache();
     else if (*attrName == HTMLNames::idAttr || *attrName == HTMLNames::nameAttr)
         invalidateIdNameCacheMaps();
 }
 
 } // namespace
 
 #endif