Updated SVGListPropertyHelper as per SVG2 Spec

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 153 matching lines @@
 
     bool adjustFromToListValues(PassRefPtrWillBeRawPtr<Derived> fromList, PassRefPtrWillBeRawPtr<Derived> toList, float percentage, AnimationMode);
 
     virtual PassRefPtrWillBeRawPtr<ItemPropertyType> createPaddingItem() const
     {
         return ItemPropertyType::create();
     }
 
 private:
     inline bool checkIndexBound(size_t, ExceptionState&);
-    bool removeFromOldOwnerListAndAdjustIndex(PassRefPtrWillBeRawPtr<ItemPropertyType>, size_t* indexToModify);
     size_t findItem(PassRefPtrWillBeRawPtr<ItemPropertyType>);
 
     WillBeHeapVector<RefPtrWillBeMember<ItemPropertyType>> m_values;
 
     static PassRefPtrWillBeRawPtr<Derived> toDerived(PassRefPtrWillBeRawPtr<SVGPropertyBase> passBase)
     {
         if (!passBase)
             return nullptr;
 
         RefPtrWillBeRawPtr<SVGPropertyBase> base = passBase;
@@ skipping 29 matching lines @@
     }
 
     m_values.clear();
 }
 
 template<typename Derived, typename ItemProperty>
 PassRefPtrWillBeRawPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::initialize(PassRefPtrWillBeRawPtr<ItemProperty> 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);
+    // SVG2-Draft Spec: If newItem is already in a list, then a new object is created with the same values as newItem and this item is inserted into the list.
+    // Otherwise, newItem itself is inserted into the list.
+    if (newItem->ownerList())
+        newItem = newItem->clone();

[fs, 2015/06/17 16:02:05]

Should we handle this in the generic
ListItemPropertyTraits::getValueForInsertionFromTearOff instead? It already has
logic for cloning the item.

[Shanmuga Pandi, 2015/06/18 11:30:45]

Done

 
     // 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>
 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>
 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();
 
     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();
-    }
+    // SVG2-Draft Spec: If newItem is already in a list, then a new object is created with the same values as newItem and this item is inserted into the list.
+    // Otherwise, newItem itself is inserted into the list.
+    if (newItem->ownerList())
+        newItem = newItem->clone();
 
     // 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>
 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);
     RefPtrWillBeRawPtr<ItemPropertyType> oldItem = m_values.at(index);
     m_values.remove(index);
     oldItem->setOwnerList(0);
     return oldItem.release();
 }
 
 template<typename Derived, typename ItemProperty>
 PassRefPtrWillBeRawPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::appendItem(PassRefPtrWillBeRawPtr<ItemProperty> 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);
+    // SVG2-Draft Spec: If newItem is already in a list, then a new object is created with the same values as newItem and this item is inserted into the list.
+    // Otherwise, newItem itself is inserted into the list.
+    if (newItem->ownerList())
+        newItem = newItem->clone();
 
     // Append the value and wrapper at the end of the list.
     append(newItem);
 
     return newItem.release();
 }
 
 template<typename Derived, typename ItemProperty>
 PassRefPtrWillBeRawPtr<ItemProperty> SVGListPropertyHelper<Derived, ItemProperty>::replaceItem(PassRefPtrWillBeRawPtr<ItemProperty> passNewItem, size_t index, ExceptionState& exceptionState)
 {
     if (!checkIndexBound(index, exceptionState))
         return nullptr;
 
     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();
-    }
+    // SVG2-Draft Spec: If newItem is already in a list, then a new object is created with the same values as newItem and this item is inserted into the list.
+    // Otherwise, newItem itself is inserted into the list.
+    if (newItem->ownerList())
+        newItem = newItem->clone();
 
     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'.
     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(PassRefPtrWillBeRawPtr<ItemPropertyType> passItem, size_t* indexToModify)
-{
-    RefPtrWillBeRawPtr<ItemPropertyType> item = passItem;
-    ASSERT(item);
-    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.
-    if (!livesInOtherList && indexToModify && indexToRemove == *indexToModify)
-        return false;
-
-    ownerList->removeItem(indexToRemove, ASSERT_NO_EXCEPTION);
-
-    if (!indexToModify)
-        return true;
-
-    // If the item lived in our list, adjust the insertion index.
-    if (!livesInOtherList) {
-        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(PassRefPtrWillBeRawPtr<ItemPropertyType> item)
 {
     return m_values.find(item);
 }
 
 template<typename Derived, typename ItemProperty>
 void SVGListPropertyHelper<Derived, ItemProperty>::deepCopy(PassRefPtrWillBeRawPtr<Derived> passFrom)
 {
     RefPtrWillBeRawPtr<Derived> from = passFrom;
 
@@ skipping 35 matching lines @@
         for (size_t i = 0; i < paddingCount; ++i)
             append(createPaddingItem());
     }
 
     return true;
 }
 
 }
 
 #endif // SVGListPropertyHelper_h