Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I3a7f89ea6b8c017335bd52739166aed708cad1e5
diff --git a/Source/core/svg/SVGAnimatedIntegerOptionalInteger.h b/Source/core/svg/SVGAnimatedIntegerOptionalInteger.h
new file mode 100644
index 0000000..78ef1eb
--- /dev/null
+++ b/Source/core/svg/SVGAnimatedIntegerOptionalInteger.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) Research In Motion Limited 2012. 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef SVGAnimatedIntegerOptionalInteger_h
+#define SVGAnimatedIntegerOptionalInteger_h
+
+#if ENABLE(SVG)
+#include "core/svg/SVGAnimatedTypeAnimator.h"
+
+namespace WebCore {
+
+class SVGAnimationElement;
+
+class SVGAnimatedIntegerOptionalIntegerAnimator : public SVGAnimatedTypeAnimator {
+public:
+ SVGAnimatedIntegerOptionalIntegerAnimator(SVGAnimationElement*, SVGElement*);
+ virtual ~SVGAnimatedIntegerOptionalIntegerAnimator() { }
+
+ virtual PassOwnPtr<SVGAnimatedType> constructFromString(const String&);
+ virtual PassOwnPtr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&);
+ virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&);
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*);
+ virtual void animValWillChange(const SVGElementAnimatedPropertyList&);
+ virtual void animValDidChange(const SVGElementAnimatedPropertyList&);
+
+ virtual void addAnimatedTypes(SVGAnimatedType*, SVGAnimatedType*);
+ virtual void calculateAnimatedValue(float percentage, unsigned repeatCount, SVGAnimatedType*, SVGAnimatedType*, SVGAnimatedType*, SVGAnimatedType*);
+ virtual float calculateDistance(const String& fromString, const String& toString);
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(SVG)
+#endif