Rename enums/functions that collide in chromium style in core/svg,xml

third_party/WebKit/Source/core/svg/SVGAnimationElement.h

 /*
  * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Cameron McCormack <cam@mcc.id.au>
  * Copyright (C) Research In Motion Limited 2011. 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
@@ skipping 63 matching lines @@
     void endElementAt(float offset);
 
     DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(begin, beginEvent);
     DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(end, endEvent);
     DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(repeat, repeatEvent);
 
     static bool isTargetAttributeCSSProperty(SVGElement*, const QualifiedName&);
 
     virtual bool isAdditive();
     bool isAccumulated() const;
-    AnimationMode animationMode() const { return m_animationMode; }
-    CalcMode calcMode() const { return m_calcMode; }
+    AnimationMode getAnimationMode() const { return m_animationMode; }
+    CalcMode getCalcMode() const { return m_calcMode; }
 
     enum ShouldApplyAnimation {
         DontApplyAnimation,
         ApplyCSSAnimation,
         ApplyXMLAnimation,
         ApplyXMLandCSSAnimation
     };
 
     ShouldApplyAnimation shouldApplyAnimation(SVGElement* targetElement, const QualifiedName& attributeName);
 
     AnimatedPropertyValueType fromPropertyValueType() const { return m_fromPropertyValueType; }
     AnimatedPropertyValueType toPropertyValueType() const { return m_toPropertyValueType; }
 
     template<typename AnimatedType, typename ParseTypeFromStringType>
     void adjustForInheritance(ParseTypeFromStringType parseTypeFromString, AnimatedPropertyValueType valueType, AnimatedType& animatedType, SVGElement* contextElement)
     {
         if (valueType != InheritValue)
             return;
         // Replace 'inherit' by its computed property value.
         String typeString;
         adjustForInheritance(contextElement, attributeName(), typeString);
         animatedType = parseTypeFromString(this, typeString);
     }
 
     template<typename AnimatedType>
     void animateDiscreteType(float percentage, const AnimatedType& fromType, const AnimatedType& toType, AnimatedType& animatedType)
     {
-        if ((animationMode() == FromToAnimation && percentage > 0.5) || animationMode() == ToAnimation || percentage == 1) {
+        if ((getAnimationMode() == FromToAnimation && percentage > 0.5) || getAnimationMode() == ToAnimation || percentage == 1) {
             animatedType = AnimatedType(toType);
             return;
         }
         animatedType = AnimatedType(fromType);
     }
 
     void animateAdditiveNumber(float percentage, unsigned repeatCount, float fromNumber, float toNumber, float toAtEndOfDurationNumber, float& animatedNumber)
     {
         float number;
-        if (calcMode() == CalcModeDiscrete)
+        if (getCalcMode() == CalcModeDiscrete)
             number = percentage < 0.5 ? fromNumber : toNumber;
         else
             number = (toNumber - fromNumber) * percentage + fromNumber;
 
         if (isAccumulated() && repeatCount)
             number += toAtEndOfDurationNumber * repeatCount;
 
-        if (isAdditive() && animationMode() != ToAnimation)
+        if (isAdditive() && getAnimationMode() != ToAnimation)
             animatedNumber += number;
         else
             animatedNumber = number;
     }
 
 protected:
     SVGAnimationElement(const QualifiedName&, Document&);
 
     void computeCSSPropertyValue(SVGElement*, CSSPropertyID, String& value);
     void determinePropertyValueTypes(const String& from, const String& to);
 
     void parseAttribute(const QualifiedName&, const AtomicString&, const AtomicString&) override;
     void svgAttributeChanged(const QualifiedName&) override;
 
     enum AttributeType {
         AttributeTypeCSS,
         AttributeTypeXML,
         AttributeTypeAuto
     };
-    AttributeType attributeType() const { return m_attributeType; }
+    AttributeType getAttributeType() const { return m_attributeType; }
 
     String toValue() const;
     String byValue() const;
     String fromValue() const;
 
     // from SVGSMILElement
     void startedActiveInterval() override;
     void updateAnimation(float percent, unsigned repeat, SVGSMILElement* resultElement) override;
 
     AnimatedPropertyValueType m_fromPropertyValueType;
@@ skipping 54 matching lines @@
     String m_lastValuesAnimationFrom;
     String m_lastValuesAnimationTo;
     bool m_hasInvalidCSSAttributeType;
     CalcMode m_calcMode;
     AnimationMode m_animationMode;
 };
 
 } // namespace blink
 
 #endif // SVGAnimationElement_h