Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I01166d4072567f174b02707d7a0850cb3fe1fd8a
diff --git a/Source/core/svg/SVGAnimatedIntegerOptionalInteger.h b/Source/core/svg/SVGAnimatedIntegerOptionalInteger.h
index a0e3352..3da7bee 100644
--- a/Source/core/svg/SVGAnimatedIntegerOptionalInteger.h
+++ b/Source/core/svg/SVGAnimatedIntegerOptionalInteger.h
@@ -41,7 +41,7 @@
// while DOM attribute and SMIL animations operate on this class.
// From Javascript, the two SVGAnimatedIntegers |firstInteger| and |secondInteger| are used.
// For example, see SVGFEDropShadowElement::stdDeviation{X,Y}()
-class SVGAnimatedIntegerOptionalInteger : public NewSVGAnimatedPropertyCommon<SVGIntegerOptionalInteger> {
+class SVGAnimatedIntegerOptionalInteger : public SVGAnimatedPropertyCommon<SVGIntegerOptionalInteger> {
public:
static PassRefPtr<SVGAnimatedIntegerOptionalInteger> create(SVGElement* contextElement, const QualifiedName& attributeName, float initialFirstValue = 0, float initialSecondValue = 0)
{
@@ -49,7 +49,7 @@
}
virtual void animationStarted() OVERRIDE;
- virtual void setAnimatedValue(PassRefPtr<NewSVGPropertyBase>) OVERRIDE;
+ virtual void setAnimatedValue(PassRefPtr<SVGPropertyBase>) OVERRIDE;
virtual bool needsSynchronizeAttribute() OVERRIDE;
virtual void animationEnded() OVERRIDE;