Make SVGElement::propertyFromAttribute return raw pointer

third_party/WebKit/Source/core/svg/SVGElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
  *
  * 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
@@ skipping 259 matching lines @@
         }
     }
     svgRareData()->setWebAnimatedAttributesDirty(false);
 }
 
 template<typename T>
 static void updateInstancesAnimatedAttribute(SVGElement* element, const QualifiedName& attribute, T callback)
 {
     SVGElement::InstanceUpdateBlocker blocker(element);
     for (SVGElement* instance : SVGAnimateElement::findElementInstances(element)) {
-        RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> animatedProperty = instance->propertyFromAttribute(attribute);
-        if (animatedProperty) {
+        if (SVGAnimatedPropertyBase* animatedProperty = instance->propertyFromAttribute(attribute)) {
             callback(*animatedProperty);
             instance->invalidateSVGAttributes();
             instance->svgAttributeChanged(attribute);
         }
     }
 }
 
 void SVGElement::setWebAnimatedAttribute(const QualifiedName& attribute, PassRefPtrWillBeRawPtr<SVGPropertyBase> value)
 {
     updateInstancesAnimatedAttribute(this, attribute, [&value](SVGAnimatedPropertyBase& animatedProperty) {
@@ skipping 336 matching lines @@
     ensureSVGRareData()->setCorrespondingElement(correspondingElement);
 }
 
 bool SVGElement::inUseShadowTree() const
 {
     return correspondingUseElement();
 }
 
 void SVGElement::parseAttribute(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& value)
 {
-    RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute(name);
-    if (property) {
+    if (SVGAnimatedPropertyBase* property = propertyFromAttribute(name)) {
         SVGParsingError parseError = NoError;
         property->setBaseValueAsString(value, parseError);
         reportAttributeParsingError(parseError, name, value);
-
         return;
     }
 
     if (name == HTMLNames::classAttr) {
         // SVG animation has currently requires special storage of values so we set
         // the className here. svgAttributeChanged actually causes the resulting
         // style updates (instead of Element::parseAttribute). We don't
         // tell Element about the change to avoid parsing the class list twice
         SVGParsingError parseError = NoError;
         m_className->setBaseValueAsString(value, parseError);
@@ skipping 86 matching lines @@
     return AnimatedUnknown;
 }
 
 void SVGElement::addToPropertyMap(PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> passProperty)
 {
     RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property(passProperty);
     QualifiedName attributeName = property->attributeName();
     m_attributeToPropertyMap.set(attributeName, property.release());
 }
 
-PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> SVGElement::propertyFromAttribute(const QualifiedName& attributeName)
+SVGAnimatedPropertyBase* SVGElement::propertyFromAttribute(const QualifiedName& attributeName) const
 {
-    AttributeToPropertyMap::iterator it = m_attributeToPropertyMap.find<SVGAttributeHashTranslator>(attributeName);
+    AttributeToPropertyMap::const_iterator it = m_attributeToPropertyMap.find<SVGAttributeHashTranslator>(attributeName);
     if (it == m_attributeToPropertyMap.end())
         return nullptr;
 
-    return it->value;
+    return it->value.get();
 }
 
 bool SVGElement::isAnimatableCSSProperty(const QualifiedName& attrName)
 {
     return animatedPropertyTypeForCSSAttribute(attrName) != AnimatedUnknown;
 }
 
 bool SVGElement::isPresentationAttribute(const QualifiedName& name) const
 {
     return cssPropertyIdForSVGAttributeName(name) > 0;
@@ skipping 479 matching lines @@
     Element::trace(visitor);
 }
 
 const AtomicString& SVGElement::eventParameterName()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt", AtomicString::ConstructFromLiteral));
     return evtString;
 }
 
 } // namespace blink