Index: Source/core/svg/SVGAnimatedString.h |
diff --git a/Source/core/svg/SVGAnimatedString.h b/Source/core/svg/SVGAnimatedString.h |
index 24887ff9c0001a59567c9632fcf5ce2322dff34c..f8e5d21fb77988a6c35340fe14fc5ba49990faa6 100644 |
--- a/Source/core/svg/SVGAnimatedString.h |
+++ b/Source/core/svg/SVGAnimatedString.h |
@@ -1,59 +1,55 @@ |
/* |
- * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
+ * Copyright (C) 2014 Google Inc. 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. |
+ * Redistribution and use in source and binary forms, with or without |
+ * modification, are permitted provided that the following conditions are |
+ * met: |
* |
- * 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. |
+ * * Redistributions of source code must retain the above copyright |
+ * notice, this list of conditions and the following disclaimer. |
+ * * Redistributions in binary form must reproduce the above |
+ * copyright notice, this list of conditions and the following disclaimer |
+ * in the documentation and/or other materials provided with the |
+ * distribution. |
+ * * Neither the name of Google Inc. nor the names of its |
+ * contributors may be used to endorse or promote products derived from |
+ * this software without specific prior written permission. |
* |
- * 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. |
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
#ifndef SVGAnimatedString_h |
#define SVGAnimatedString_h |
-#include "core/svg/SVGAnimatedTypeAnimator.h" |
-#include "core/svg/properties/SVGAnimatedPropertyMacros.h" |
-#include "core/svg/properties/SVGAnimatedStaticPropertyTearOff.h" |
+#include "core/svg/SVGString.h" |
+#include "core/svg/properties/NewSVGAnimatedProperty.h" |
namespace WebCore { |
-typedef SVGAnimatedStaticPropertyTearOff<String> SVGAnimatedString; |
- |
-// Helper macros to declare/define a SVGAnimatedString object |
-#define DECLARE_ANIMATED_STRING(UpperProperty, LowerProperty) \ |
-DECLARE_ANIMATED_PROPERTY(SVGAnimatedString, String, UpperProperty, LowerProperty) |
- |
-#define DEFINE_ANIMATED_STRING(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \ |
-DEFINE_ANIMATED_PROPERTY(AnimatedString, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty, SVGAnimatedString, String) |
- |
-class SVGAnimationElement; |
- |
-class SVGAnimatedStringAnimator FINAL : public SVGAnimatedTypeAnimator { |
+class SVGAnimatedString FINAL : public NewSVGAnimatedProperty<SVGString> { |
public: |
- SVGAnimatedStringAnimator(SVGAnimationElement*, SVGElement*); |
- virtual ~SVGAnimatedStringAnimator() { } |
- |
- virtual PassOwnPtr<SVGAnimatedType> constructFromString(const String&) OVERRIDE; |
- virtual PassOwnPtr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) OVERRIDE; |
- virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) OVERRIDE; |
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) OVERRIDE; |
- virtual void animValWillChange(const SVGElementAnimatedPropertyList&) OVERRIDE; |
- virtual void animValDidChange(const SVGElementAnimatedPropertyList&) OVERRIDE; |
- |
- virtual void addAnimatedTypes(SVGAnimatedType*, SVGAnimatedType*) OVERRIDE; |
- virtual void calculateAnimatedValue(float percentage, unsigned repeatCount, SVGAnimatedType*, SVGAnimatedType*, SVGAnimatedType*, SVGAnimatedType*) OVERRIDE; |
- virtual float calculateDistance(const String& fromString, const String& toString) OVERRIDE; |
+ static PassRefPtr<SVGAnimatedString> create(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtr<SVGString> initialValue) |
+ { |
+ return adoptRef(new SVGAnimatedString(contextElement, attributeName, initialValue)); |
+ } |
+ |
+protected: |
+ SVGAnimatedString(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtr<SVGString> initialValue) |
+ : NewSVGAnimatedProperty<SVGString>(contextElement, attributeName, initialValue) |
+ { |
+ } |
}; |
} // namespace WebCore |
-#endif |
+#endif // SVGAnimatedString_h |