Merge 143454

Source/WebCore/svg/properties/SVGPathSegListPropertyTearOff.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 58 matching lines @@
     void clear(ExceptionCode&);
 
     PassListItemType initialize(PassListItemType passNewItem, ExceptionCode& ec)
     {
         // Not specified, but FF/Opera do it this way, and it's just sane.
         if (!passNewItem) {
             ec = SVGException::SVG_WRONG_TYPE_ERR;
             return 0;
         }
 
+        clearContextAndRoles();
         ListItemType newItem = passNewItem;
         return Base::initializeValues(newItem, ec);
     }
 
     PassListItemType getItem(unsigned index, ExceptionCode&);
 
     PassListItemType insertItemBefore(PassListItemType passNewItem, unsigned index, ExceptionCode& ec)
     {
         // Not specified, but FF/Opera do it this way, and it's just sane.
         if (!passNewItem) {
             ec = SVGException::SVG_WRONG_TYPE_ERR;
             return 0;
         }
 
         ListItemType newItem = passNewItem;
         return Base::insertItemBeforeValues(newItem, index, ec);
     }
 
-    PassListItemType replaceItem(PassListItemType passNewItem, unsigned index, ExceptionCode& ec)
-    {
-        // Not specified, but FF/Opera do it this way, and it's just sane.
-        if (!passNewItem) {
-            ec = SVGException::SVG_WRONG_TYPE_ERR;
-            return 0;
-        }
-
-        ListItemType newItem = passNewItem;
-        return Base::replaceItemValues(newItem, index, ec);
-    }
+    PassListItemType replaceItem(PassListItemType, unsigned index, ExceptionCode&);
 
     PassListItemType removeItem(unsigned index, ExceptionCode&);
 
     PassListItemType appendItem(PassListItemType passNewItem, ExceptionCode& ec)
     {
         // Not specified, but FF/Opera do it this way, and it's just sane.
         if (!passNewItem) {
             ec = SVGException::SVG_WRONG_TYPE_ERR;
             return 0;
         }
 
         ListItemType newItem = passNewItem;
         return Base::appendItemValues(newItem, ec);
     }
 
 private:
     SVGPathSegListPropertyTearOff(AnimatedListPropertyTearOff* animatedProperty, SVGPropertyRole role, SVGPathSegRole pathSegRole, SVGPathSegList& values, ListWrapperCache& wrappers)
         : SVGListProperty<SVGPathSegList>(role, values, &wrappers)
         , m_animatedProperty(animatedProperty)
         , m_pathSegRole(pathSegRole)
     {
     }
 
     SVGPathElement* contextElement() const;
 
+    void clearContextAndRoles();
+
     using Base::m_role;
 
     virtual bool isReadOnly() const
     {
         if (m_role == AnimValRole)
             return true;
         if (m_animatedProperty && m_animatedProperty->isReadOnly())
             return true;
         return false;
     }
@@ skipping 19 matching lines @@
 
 private:
     RefPtr<AnimatedListPropertyTearOff> m_animatedProperty;
     SVGPathSegRole m_pathSegRole;
 };
 
 }
 
 #endif // ENABLE(SVG)
 #endif // SVGListPropertyTearOff_h