Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: Source/core/svg/SVGAnimateElement.h

Issue 631153003: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/svg (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/svg/SVGAngleTearOff.h ('k') | Source/core/svg/SVGAnimateMotionElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
4 * Copyright (C) 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 2008 Apple Inc. All rights reserved.
5 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 20 matching lines...) Expand all
31 namespace blink { 31 namespace blink {
32 32
33 class SVGAnimatedTypeAnimator; 33 class SVGAnimatedTypeAnimator;
34 34
35 class SVGAnimateElement : public SVGAnimationElement { 35 class SVGAnimateElement : public SVGAnimationElement {
36 DEFINE_WRAPPERTYPEINFO(); 36 DEFINE_WRAPPERTYPEINFO();
37 public: 37 public:
38 static PassRefPtrWillBeRawPtr<SVGAnimateElement> create(Document&); 38 static PassRefPtrWillBeRawPtr<SVGAnimateElement> create(Document&);
39 virtual ~SVGAnimateElement(); 39 virtual ~SVGAnimateElement();
40 40
41 virtual void trace(Visitor*) OVERRIDE; 41 virtual void trace(Visitor*) override;
42 42
43 AnimatedPropertyType animatedPropertyType(); 43 AnimatedPropertyType animatedPropertyType();
44 bool animatedPropertyTypeSupportsAddition(); 44 bool animatedPropertyTypeSupportsAddition();
45 45
46 protected: 46 protected:
47 SVGAnimateElement(const QualifiedName&, Document&); 47 SVGAnimateElement(const QualifiedName&, Document&);
48 48
49 virtual void resetAnimatedType() OVERRIDE FINAL; 49 virtual void resetAnimatedType() override final;
50 virtual void clearAnimatedType(SVGElement* targetElement) OVERRIDE FINAL; 50 virtual void clearAnimatedType(SVGElement* targetElement) override final;
51 51
52 virtual bool calculateToAtEndOfDurationValue(const String& toAtEndOfDuration String) OVERRIDE FINAL; 52 virtual bool calculateToAtEndOfDurationValue(const String& toAtEndOfDuration String) override final;
53 virtual bool calculateFromAndToValues(const String& fromString, const String & toString) OVERRIDE FINAL; 53 virtual bool calculateFromAndToValues(const String& fromString, const String & toString) override final;
54 virtual bool calculateFromAndByValues(const String& fromString, const String & byString) OVERRIDE FINAL; 54 virtual bool calculateFromAndByValues(const String& fromString, const String & byString) override final;
55 virtual void calculateAnimatedValue(float percentage, unsigned repeatCount, SVGSMILElement* resultElement) OVERRIDE FINAL; 55 virtual void calculateAnimatedValue(float percentage, unsigned repeatCount, SVGSMILElement* resultElement) override final;
56 virtual void applyResultsToTarget() OVERRIDE FINAL; 56 virtual void applyResultsToTarget() override final;
57 virtual float calculateDistance(const String& fromString, const String& toSt ring) OVERRIDE FINAL; 57 virtual float calculateDistance(const String& fromString, const String& toSt ring) override final;
58 virtual bool isAdditive() OVERRIDE FINAL; 58 virtual bool isAdditive() override final;
59 59
60 virtual void setTargetElement(SVGElement*) OVERRIDE FINAL; 60 virtual void setTargetElement(SVGElement*) override final;
61 virtual void setAttributeName(const QualifiedName&) OVERRIDE FINAL; 61 virtual void setAttributeName(const QualifiedName&) override final;
62 62
63 private: 63 private:
64 void resetAnimatedPropertyType(); 64 void resetAnimatedPropertyType();
65 SVGAnimatedTypeAnimator* ensureAnimator(); 65 SVGAnimatedTypeAnimator* ensureAnimator();
66 66
67 virtual bool hasValidAttributeType() OVERRIDE; 67 virtual bool hasValidAttributeType() override;
68 68
69 RefPtr<SVGPropertyBase> m_fromProperty; 69 RefPtr<SVGPropertyBase> m_fromProperty;
70 RefPtr<SVGPropertyBase> m_toProperty; 70 RefPtr<SVGPropertyBase> m_toProperty;
71 RefPtr<SVGPropertyBase> m_toAtEndOfDurationProperty; 71 RefPtr<SVGPropertyBase> m_toAtEndOfDurationProperty;
72 RefPtr<SVGPropertyBase> m_animatedProperty; 72 RefPtr<SVGPropertyBase> m_animatedProperty;
73 73
74 OwnPtrWillBeMember<SVGAnimatedTypeAnimator> m_animator; 74 OwnPtrWillBeMember<SVGAnimatedTypeAnimator> m_animator;
75 }; 75 };
76 76
77 inline bool isSVGAnimateElement(const SVGElement& element) 77 inline bool isSVGAnimateElement(const SVGElement& element)
78 { 78 {
79 return element.hasTagName(SVGNames::animateTag) 79 return element.hasTagName(SVGNames::animateTag)
80 || element.hasTagName(SVGNames::animateTransformTag) 80 || element.hasTagName(SVGNames::animateTransformTag)
81 || element.hasTagName(SVGNames::setTag); 81 || element.hasTagName(SVGNames::setTag);
82 } 82 }
83 83
84 DEFINE_SVGELEMENT_TYPE_CASTS_WITH_FUNCTION(SVGAnimateElement); 84 DEFINE_SVGELEMENT_TYPE_CASTS_WITH_FUNCTION(SVGAnimateElement);
85 85
86 } // namespace blink 86 } // namespace blink
87 87
88 #endif // SVGAnimateElement_h 88 #endif // SVGAnimateElement_h
OLDNEW
« no previous file with comments | « Source/core/svg/SVGAngleTearOff.h ('k') | Source/core/svg/SVGAnimateMotionElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698