Oilpan: move SVG property hierarchy to the heap.

Source/core/svg/properties/SVGListPropertyHelper.h

 /*
  * Copyright (C) 2013 Google 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 36 matching lines @@
 class SVGListPropertyHelper : public SVGPropertyHelper<Derived> {
 public:
     typedef ItemProperty ItemPropertyType;
 
     SVGListPropertyHelper()
     {
     }
 
     ~SVGListPropertyHelper()
     {
+#if !ENABLE(OILPAN)
         clear();
+#endif
     }
 
     // used from Blink C++ code:
 
     ItemPropertyType* at(size_t index)
     {
         ASSERT(index < m_values.size());
         ASSERT(m_values.at(index)->ownerList() == this);
         return m_values.at(index).get();
     }
 
     const ItemPropertyType* at(size_t index) const
     {
         return const_cast<SVGListPropertyHelper<Derived, ItemProperty>*>(this)->at(index);
     }
 
     class ConstIterator {
     private:
-        typedef typename Vector<RefPtr<ItemPropertyType> >::const_iterator WrappedType;
+        typedef typename WillBeHeapVector<RefPtrWillBeMember<ItemPropertyType> >::const_iterator WrappedType;
 
     public:
         ConstIterator(WrappedType it)
             : m_it(it)
         {
         }
 
         ConstIterator& operator++() { ++m_it; return *this; }
 
         bool operator==(const ConstIterator& o) const { return m_it == o.m_it; }
         bool operator!=(const ConstIterator& o) const { return m_it != o.m_it; }
 
-        PassRefPtr<ItemPropertyType> operator*() { return *m_it; }
-        PassRefPtr<ItemPropertyType> operator->() { return *m_it; }
+        PassRefPtrWillBeRawPtr<ItemPropertyType> operator*() { return *m_it; }
+        PassRefPtrWillBeRawPtr<ItemPropertyType> operator->() { return *m_it; }
 
     private:
         WrappedType m_it;
     };
 
     ConstIterator begin() const
     {
         return ConstIterator(m_values.begin());
     }
 
     ConstIterator lastAppended() const
     {
         return ConstIterator(m_values.begin() + m_values.size() - 1);
     }
 
     ConstIterator end() const
     {
         return ConstIterator(m_values.end());
     }
 
-    void append(PassRefPtr<ItemPropertyType> passNewItem)
+    void append(PassRefPtrWillBeRawPtr<ItemPropertyType> passNewItem)
     {
-        RefPtr<ItemPropertyType> newItem = passNewItem;
+        RefPtrWillBeRawPtr<ItemPropertyType> newItem = passNewItem;
 
         ASSERT(newItem);
         m_values.append(newItem);
         newItem->setOwnerList(this);
     }
 
     bool operator==(const Derived&) const;
     bool operator!=(const Derived& other) const
     {
         return !(*this == other);
     }
 
     bool isEmpty() const
     {
         return !length();
     }
 
-    virtual PassRefPtr<Derived> clone()
+    virtual PassRefPtrWillBeRawPtr<Derived> clone()
     {
-        RefPtr<Derived> svgList = Derived::create();
+        RefPtrWillBeRawPtr<Derived> svgList = Derived::create();
         svgList->deepCopy(static_cast<Derived*>(this));
         return svgList.release();
     }
 
     // SVGList*Property DOM spec:
 
     size_t length() const
     {
         return m_values.size();
     }
 
     void clear();
 
-    PassRefPtr<ItemPropertyType> initialize(PassRefPtr<ItemPropertyType>);
-    PassRefPtr<ItemPropertyType> getItem(size_t, ExceptionState&);
-    PassRefPtr<ItemPropertyType> insertItemBefore(PassRefPtr<ItemPropertyType>, size_t);
-    PassRefPtr<ItemPropertyType> removeItem(size_t, ExceptionState&);
-    PassRefPtr<ItemPropertyType> appendItem(PassRefPtr<ItemPropertyType>);
-    PassRefPtr<ItemPropertyType> replaceItem(PassRefPtr<ItemPropertyType>, size_t, ExceptionState&);
+    PassRefPtrWillBeRawPtr<ItemPropertyType> initialize(PassRefPtrWillBeRawPtr<ItemPropertyType>);
+    PassRefPtrWillBeRawPtr<ItemPropertyType> getItem(size_t, ExceptionState&);
+    PassRefPtrWillBeRawPtr<ItemPropertyType> insertItemBefore(PassRefPtrWillBeRawPtr<ItemPropertyType>, size_t);
+    PassRefPtrWillBeRawPtr<ItemPropertyType> removeItem(size_t, ExceptionState&);
+    PassRefPtrWillBeRawPtr<ItemPropertyType> appendItem(PassRefPtrWillBeRawPtr<ItemPropertyType>);
+    PassRefPtrWillBeRawPtr<ItemPropertyType> replaceItem(PassRefPtrWillBeRawPtr<ItemPropertyType>, size_t, ExceptionState&);
+
+    virtual void trace(Visitor* visitor) override
+    {
+        visitor->trace(m_values);
+        SVGPropertyHelper<Derived>::trace(visitor);
+    }
 
 protected:
-    void deepCopy(PassRefPtr<Derived>);
+    void deepCopy(PassRefPtrWillBeRawPtr<Derived>);
 
-    bool adjustFromToListValues(PassRefPtr<Derived> fromList, PassRefPtr<Derived> toList, float percentage, AnimationMode);
+    bool adjustFromToListValues(PassRefPtrWillBeRawPtr<Derived> fromList, PassRefPtrWillBeRawPtr<Derived> toList, float percentage, AnimationMode);
 
-    virtual PassRefPtr<ItemPropertyType> createPaddingItem() const
+    virtual PassRefPtrWillBeRawPtr<ItemPropertyType> createPaddingItem() const
     {
         return ItemPropertyType::create();
     }
 
 private:
     inline bool checkIndexBound(size_t, ExceptionState&);
-    bool removeFromOldOwnerListAndAdjustIndex(PassRefPtr<ItemPropertyType>, size_t* indexToModify);
-    size_t findItem(PassRefPtr<ItemPropertyType>);
+    bool removeFromOldOwnerListAndAdjustIndex(PassRefPtrWillBeRawPtr<ItemPropertyType>, size_t* indexToModify);
+    size_t findItem(PassRefPtrWillBeRawPtr<ItemPropertyType>);
 
-    Vector<RefPtr<ItemPropertyType> > m_values;
+    WillBeHeapVector<RefPtrWillBeMember<ItemPropertyType> > m_values;
 
-    static PassRefPtr<Derived> toDerived(PassRefPtr<SVGPropertyBase> passBase)
+    static PassRefPtrWillBeRawPtr<Derived> toDerived(PassRefPtrWillBeRawPtr<SVGPropertyBase> passBase)
     {
         if (!passBase)
             return nullptr;
 
-        RefPtr<SVGPropertyBase> base = passBase;
+        RefPtrWillBeRawPtr<SVGPropertyBase> base = passBase;
         ASSERT(base->type() == Derived::classType());
         return static_pointer_cast<Derived>(base);
     }
 };
 
 template<typename Derived, typename ItemProperty>
 bool SVGListPropertyHelper<Derived, ItemProperty>::operator==(const Derived& other) const
 {
     if (length() != other.length())
         return false;
 
     size_t size = length();
     for (size_t i = 0; i < size; ++i) {
         if (*at(i) != *other.at(i))
             return false;
     }
 
     return true;
 }
 
 template<typename Derived, typename ItemProperty>
 void SVGListPropertyHelper<Derived, ItemProperty>::clear()
 {
     // detach all list items as they are no longer part of this list
-    typename Vector<RefPtr<ItemPropertyType> >::const_iterator it = m_values.begin();
-    typename Vector<RefPtr<ItemPropertyType> >::const_iterator itEnd = m_values.end();
+    typename WillBeHeapVector<RefPtrWillBeMember<ItemPropertyType> >::const_iterator it = m_values.begin();
+    typename WillBeHeapVector<RefPtrWillBeMember<ItemPropertyType> >::const_iterator itEnd = m_values.end();
     for (; it != itEnd; ++it) {
         ASSERT((*it)->ownerList() == this);
         (*it)->setOwnerList(0);
     }
 
     m_values.clear();
 }
 
 template<typename Derived, typename ItemProperty>
-PassRefPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::initialize(PassRefPtr<ItemProperty> passNewItem)
+PassRefPtrWillBeRawPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::initialize(PassRefPtrWillBeRawPtr<ItemProperty> passNewItem)
 {
-    RefPtr<ItemPropertyType> newItem = passNewItem;
+    RefPtrWillBeRawPtr<ItemPropertyType> newItem = passNewItem;
 
     // Spec: If the inserted item is already in a list, it is removed from its previous list before it is inserted into this list.
     removeFromOldOwnerListAndAdjustIndex(newItem, 0);
 
     // Spec: Clears all existing current items from the list and re-initializes the list to hold the single item specified by the parameter.
     clear();
     append(newItem);
     return newItem.release();
 }
 
 template<typename Derived, typename ItemProperty>
-PassRefPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::getItem(size_t index, ExceptionState& exceptionState)
+PassRefPtrWillBeRawPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::getItem(size_t index, ExceptionState& exceptionState)
 {
     if (!checkIndexBound(index, exceptionState))
         return nullptr;
 
     ASSERT(index < m_values.size());
     ASSERT(m_values.at(index)->ownerList() == this);
     return m_values.at(index);
 }
 
 template<typename Derived, typename ItemProperty>
-PassRefPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::insertItemBefore(PassRefPtr<ItemProperty> passNewItem, size_t index)
+PassRefPtrWillBeRawPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::insertItemBefore(PassRefPtrWillBeRawPtr<ItemProperty> passNewItem, size_t index)
 {
     // Spec: If the index is greater than or equal to length, then the new item is appended to the end of the list.
     if (index > m_values.size())
         index = m_values.size();
 
-    RefPtr<ItemPropertyType> newItem = passNewItem;
+    RefPtrWillBeRawPtr<ItemPropertyType> newItem = passNewItem;
 
     // Spec: If newItem is already in a list, it is removed from its previous list before it is inserted into this list.
     if (!removeFromOldOwnerListAndAdjustIndex(newItem, &index)) {
         // Inserting the item before itself is a no-op.
         return newItem.release();
     }
 
     // Spec: Inserts a new item into the list at the specified position. The index of the item before which the new item is to be
     // inserted. The first item is number 0. If the index is equal to 0, then the new item is inserted at the front of the list.
     m_values.insert(index, newItem);
     newItem->setOwnerList(this);
 
     return newItem.release();
 }
 
 template<typename Derived, typename ItemProperty>
-PassRefPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::removeItem(size_t index, ExceptionState& exceptionState)
+PassRefPtrWillBeRawPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::removeItem(size_t index, ExceptionState& exceptionState)
 {
     if (index >= m_values.size()) {
         exceptionState.throwDOMException(IndexSizeError, ExceptionMessages::indexExceedsMaximumBound("index", index, m_values.size()));
         return nullptr;
     }
     ASSERT(m_values.at(index)->ownerList() == this);
-    RefPtr<ItemPropertyType> oldItem = m_values.at(index);
+    RefPtrWillBeRawPtr<ItemPropertyType> oldItem = m_values.at(index);
     m_values.remove(index);
     oldItem->setOwnerList(0);
     return oldItem.release();
 }
 
 template<typename Derived, typename ItemProperty>
-PassRefPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::appendItem(PassRefPtr<ItemProperty> passNewItem)
+PassRefPtrWillBeRawPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::appendItem(PassRefPtrWillBeRawPtr<ItemProperty> passNewItem)
 {
-    RefPtr<ItemPropertyType> newItem = passNewItem;
+    RefPtrWillBeRawPtr<ItemPropertyType> newItem = passNewItem;
 
     // Spec: If newItem is already in a list, it is removed from its previous list before it is inserted into this list.
     removeFromOldOwnerListAndAdjustIndex(newItem, 0);
 
     // Append the value and wrapper at the end of the list.
     append(newItem);
 
     return newItem.release();
 }
 
 template<typename Derived, typename ItemProperty>
-PassRefPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::replaceItem(PassRefPtr<ItemProperty> passNewItem, size_t index, ExceptionState& exceptionState)
+PassRefPtrWillBeRawPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::replaceItem(PassRefPtrWillBeRawPtr<ItemProperty> passNewItem, size_t index, ExceptionState& exceptionState)
 {
     if (!checkIndexBound(index, exceptionState))
         return nullptr;
 
-    RefPtr<ItemPropertyType> newItem = passNewItem;
+    RefPtrWillBeRawPtr<ItemPropertyType> newItem = passNewItem;
 
     // Spec: If newItem is already in a list, it is removed from its previous list before it is inserted into this list.
     // Spec: If the item is already in this list, note that the index of the item to replace is before the removal of the item.
     if (!removeFromOldOwnerListAndAdjustIndex(newItem, &index)) {
         // Replacing the item with itself is a no-op.
         return newItem.release();
     }
 
     if (m_values.isEmpty()) {
         // 'newItem' already lived in our list, we removed it, and now we're empty, which means there's nothing to replace.
         exceptionState.throwDOMException(IndexSizeError, String::format("Failed to replace the provided item at index %zu.", index));
         return nullptr;
     }
 
     // Update the value at the desired position 'index'.
-    RefPtr<ItemPropertyType>& position = m_values[index];
+    RefPtrWillBeMember<ItemPropertyType>& position = m_values[index];
     ASSERT(position->ownerList() == this);
     position->setOwnerList(0);
     position = newItem;
     newItem->setOwnerList(this);
 
     return newItem.release();
 }
 
 template<typename Derived, typename ItemProperty>
 bool SVGListPropertyHelper<Derived, ItemProperty>::checkIndexBound(size_t index, ExceptionState& exceptionState)
 {
     if (index >= m_values.size()) {
         exceptionState.throwDOMException(IndexSizeError, ExceptionMessages::indexExceedsMaximumBound("index", index, m_values.size()));
         return false;
     }
 
     return true;
 }
 
 template<typename Derived, typename ItemProperty>
-bool SVGListPropertyHelper<Derived, ItemProperty>::removeFromOldOwnerListAndAdjustIndex(PassRefPtr<ItemPropertyType> passItem, size_t* indexToModify)
+bool SVGListPropertyHelper<Derived, ItemProperty>::removeFromOldOwnerListAndAdjustIndex(PassRefPtrWillBeRawPtr<ItemPropertyType> passItem, size_t* indexToModify)
 {
-    RefPtr<ItemPropertyType> item = passItem;
+    RefPtrWillBeRawPtr<ItemPropertyType> item = passItem;
     ASSERT(item);
-    RefPtr<Derived> ownerList = toDerived(item->ownerList());
+    RefPtrWillBeRawPtr<Derived> ownerList = toDerived(item->ownerList());
     if (!ownerList)
         return true;
 
     // Spec: If newItem is already in a list, it is removed from its previous list before it is inserted into this list.
     // 'newItem' is already living in another list. If it's not our list, synchronize the other lists wrappers after the removal.
     bool livesInOtherList = ownerList.get() != this;
     size_t indexToRemove = ownerList->findItem(item);
     ASSERT(indexToRemove != WTF::kNotFound);
 
     // Do not remove newItem if already in this list at the target index.
@@ skipping 10 matching lines @@
         size_t& index = *indexToModify;
         // Spec: If the item is already in this list, note that the index of the item to (replace|insert before) is before the removal of the item.
         if (static_cast<size_t>(indexToRemove) < index)
             --index;
     }
 
     return true;
 }
 
 template<typename Derived, typename ItemProperty>
-size_t SVGListPropertyHelper<Derived, ItemProperty>::findItem(PassRefPtr<ItemPropertyType> item)
+size_t SVGListPropertyHelper<Derived, ItemProperty>::findItem(PassRefPtrWillBeRawPtr<ItemPropertyType> item)
 {
     return m_values.find(item);
 }
 
 template<typename Derived, typename ItemProperty>
-void SVGListPropertyHelper<Derived, ItemProperty>::deepCopy(PassRefPtr<Derived> passFrom)
+void SVGListPropertyHelper<Derived, ItemProperty>::deepCopy(PassRefPtrWillBeRawPtr<Derived> passFrom)
 {
-    RefPtr<Derived> from = passFrom;
+    RefPtrWillBeRawPtr<Derived> from = passFrom;
 
     clear();
-    typename Vector<RefPtr<ItemPropertyType> >::const_iterator it = from->m_values.begin();
-    typename Vector<RefPtr<ItemPropertyType> >::const_iterator itEnd = from->m_values.end();
+    typename WillBeHeapVector<RefPtrWillBeMember<ItemPropertyType> >::const_iterator it = from->m_values.begin();
+    typename WillBeHeapVector<RefPtrWillBeMember<ItemPropertyType> >::const_iterator itEnd = from->m_values.end();
     for (; it != itEnd; ++it) {
         append((*it)->clone());
     }
 }
 
 template<typename Derived, typename ItemProperty>
-bool SVGListPropertyHelper<Derived, ItemProperty>::adjustFromToListValues(PassRefPtr<Derived> passFromList, PassRefPtr<Derived> passToList, float percentage, AnimationMode mode)
+bool SVGListPropertyHelper<Derived, ItemProperty>::adjustFromToListValues(PassRefPtrWillBeRawPtr<Derived> passFromList, PassRefPtrWillBeRawPtr<Derived> passToList, float percentage, AnimationMode mode)
 {
-    RefPtr<Derived> fromList = passFromList;
-    RefPtr<Derived> toList = passToList;
+    RefPtrWillBeRawPtr<Derived> fromList = passFromList;
+    RefPtrWillBeRawPtr<Derived> toList = passToList;
 
     // If no 'to' value is given, nothing to animate.
     size_t toListSize = toList->length();
     if (!toListSize)
         return false;
 
     // If the 'from' value is given and it's length doesn't match the 'to' value list length, fallback to a discrete animation.
     size_t fromListSize = fromList->length();
     if (fromListSize != toListSize && fromListSize) {
         if (percentage < 0.5) {
@@ skipping 12 matching lines @@
         for (size_t i = 0; i < paddingCount; ++i)
             append(createPaddingItem());
     }
 
     return true;
 }
 
 }
 
 #endif // SVGListPropertyHelper_h