Merge 158408 "Revert 157959 "Introduce a new reference graph to ..."

Source/core/svg/properties/SVGListPropertyTearOff.h

 /*
  * Copyright (C) Research In Motion Limited 2010. 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 74 matching lines @@
         Base::clearValuesAndWrappers(es);
     }
 
     PassListItemTearOff initialize(PassListItemTearOff passNewItem, ExceptionState& es)
     {
         return Base::initializeValuesAndWrappers(passNewItem, es);
     }
 
     PassListItemTearOff getItem(unsigned index, ExceptionState& es)
     {
-        ASSERT(m_animatedProperty);
-        return Base::getItemValuesAndWrappers(m_animatedProperty, index, es);
+        return Base::getItemValuesAndWrappers(m_animatedProperty.get(), index, es);
     }
 
     PassListItemTearOff insertItemBefore(PassListItemTearOff passNewItem, unsigned index, ExceptionState& es)
     {
         return Base::insertItemBeforeValuesAndWrappers(passNewItem, index, es);
     }
 
     PassListItemTearOff replaceItem(PassListItemTearOff passNewItem, unsigned index, ExceptionState& es)
     {
         return Base::replaceItemValuesAndWrappers(passNewItem, index, es);
     }
 
     PassListItemTearOff removeItem(unsigned index, ExceptionState& es)
     {
-        ASSERT(m_animatedProperty);
-        return Base::removeItemValuesAndWrappers(m_animatedProperty, index, es);
+        return Base::removeItemValuesAndWrappers(m_animatedProperty.get(), index, es);
     }
 
     PassListItemTearOff appendItem(PassListItemTearOff passNewItem, ExceptionState& es)
     {
         return Base::appendItemValuesAndWrappers(passNewItem, es);
     }
 
-    SVGElement* contextElement() const
-    {
-        ASSERT(m_animatedProperty);
-        return m_animatedProperty->contextElement();
-    }
-
-    void clearAnimatedProperty()
-    {
-        ASSERT(m_animatedProperty);
-        Base::detachListWrappers(0);
-        m_animatedProperty = 0;
-        m_values = 0;
-        m_wrappers = 0;
-    }
-
 protected:
     SVGListPropertyTearOff(AnimatedListPropertyTearOff* animatedProperty, SVGPropertyRole role, PropertyType& values, ListWrapperCache& wrappers)
         : SVGListProperty<PropertyType>(role, values, &wrappers)
         , m_animatedProperty(animatedProperty)
     {
-        ASSERT(m_animatedProperty);
     }
 
     virtual bool isReadOnly() const
     {
         if (m_role == AnimValRole)
             return true;
         if (m_animatedProperty && m_animatedProperty->isReadOnly())
             return true;
         return false;
     }
 
     virtual void commitChange()
     {
         ASSERT(m_values);
         ASSERT(m_wrappers);
-        ASSERT(m_animatedProperty);
 
         // Update existing wrappers, as the index in the values list has changed.
         unsigned size = m_wrappers->size();
         ASSERT(size == m_values->size());
         for (unsigned i = 0; i < size; ++i) {
             ListItemTearOff* item = m_wrappers->at(i).get();
             if (!item)
                 continue;
-            item->setAnimatedProperty(m_animatedProperty);
+            item->setAnimatedProperty(m_animatedProperty.get());
             item->setValue(m_values->at(i));
         }
 
         m_animatedProperty->commitChange();
     }
 
     virtual bool processIncomingListItemValue(const ListItemType&, unsigned*)
     {
         ASSERT_NOT_REACHED();
         return true;
@@ skipping 15 matching lines @@
             // Otherwhise we'll end up having two SVGAnimatedPropertys that operate on the same SVGPropertyTearOff. Consider the example above:
             // SVGRectElements SVGAnimatedLength 'width' property baseVal points to the same tear off object
             // that's inserted into SVGTextElements SVGAnimatedLengthList 'x'. textElement.x.baseVal.getItem(0).value += 150 would
             // mutate the rectElement width _and_ the textElement x list. That's obviously wrong, take care of that.
             newItem = ListItemTearOff::create(newItem->propertyReference());
             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.
-        ASSERT(m_animatedProperty);
         bool livesInOtherList = animatedPropertyOfItem != m_animatedProperty;
         AnimatedListPropertyTearOff* propertyTearOff = static_cast<AnimatedListPropertyTearOff*>(animatedPropertyOfItem);
         int indexToRemove = propertyTearOff->findItem(newItem.get());
         ASSERT(indexToRemove != -1);
 
         // Do not remove newItem if already in this list at the target index.
         if (!livesInOtherList && indexToModify && static_cast<unsigned>(indexToRemove) == *indexToModify)
             return false;
 
         propertyTearOff->removeItemFromList(indexToRemove, livesInOtherList);
 
         if (!indexToModify)
             return true;
 
         // If the item lived in our list, adjust the insertion index.
         if (!livesInOtherList) {
             unsigned& 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<unsigned>(indexToRemove) < index)
                 --index;
         }
 
         return true;
     }
 
     // Back pointer to the animated property that created us
     // For example (text.x.baseVal): m_animatedProperty points to the 'x' SVGAnimatedLengthList object
-    AnimatedListPropertyTearOff* m_animatedProperty;
+    RefPtr<AnimatedListPropertyTearOff> m_animatedProperty;
 };
 
 }
 
 #endif // SVGListPropertyTearOff_h