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

Side by Side Diff: Source/core/svg/SVGAnimationElement.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/SVGAnimatedTypeAnimator.h ('k') | Source/core/svg/SVGBoolean.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, 2006 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2008 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Cameron McCormack <cam@mcc.id.au> 6 * Copyright (C) 2008 Cameron McCormack <cam@mcc.id.au>
7 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 animatedNumber = number; 129 animatedNumber = number;
130 } 130 }
131 131
132 protected: 132 protected:
133 SVGAnimationElement(const QualifiedName&, Document&); 133 SVGAnimationElement(const QualifiedName&, Document&);
134 134
135 void computeCSSPropertyValue(SVGElement*, CSSPropertyID, String& value); 135 void computeCSSPropertyValue(SVGElement*, CSSPropertyID, String& value);
136 void determinePropertyValueTypes(const String& from, const String& to); 136 void determinePropertyValueTypes(const String& from, const String& to);
137 137
138 bool isSupportedAttribute(const QualifiedName&); 138 bool isSupportedAttribute(const QualifiedName&);
139 virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERR IDE; 139 virtual void parseAttribute(const QualifiedName&, const AtomicString&) overr ide;
140 virtual void svgAttributeChanged(const QualifiedName&) OVERRIDE; 140 virtual void svgAttributeChanged(const QualifiedName&) override;
141 141
142 enum AttributeType { 142 enum AttributeType {
143 AttributeTypeCSS, 143 AttributeTypeCSS,
144 AttributeTypeXML, 144 AttributeTypeXML,
145 AttributeTypeAuto 145 AttributeTypeAuto
146 }; 146 };
147 AttributeType attributeType() const { return m_attributeType; } 147 AttributeType attributeType() const { return m_attributeType; }
148 148
149 String toValue() const; 149 String toValue() const;
150 String byValue() const; 150 String byValue() const;
151 String fromValue() const; 151 String fromValue() const;
152 152
153 // from SVGSMILElement 153 // from SVGSMILElement
154 virtual void startedActiveInterval() OVERRIDE; 154 virtual void startedActiveInterval() override;
155 virtual void updateAnimation(float percent, unsigned repeat, SVGSMILElement* resultElement) OVERRIDE; 155 virtual void updateAnimation(float percent, unsigned repeat, SVGSMILElement* resultElement) override;
156 156
157 AnimatedPropertyValueType m_fromPropertyValueType; 157 AnimatedPropertyValueType m_fromPropertyValueType;
158 AnimatedPropertyValueType m_toPropertyValueType; 158 AnimatedPropertyValueType m_toPropertyValueType;
159 159
160 virtual void setTargetElement(SVGElement*) OVERRIDE; 160 virtual void setTargetElement(SVGElement*) override;
161 virtual void setAttributeName(const QualifiedName&) OVERRIDE; 161 virtual void setAttributeName(const QualifiedName&) override;
162 162
163 bool hasInvalidCSSAttributeType() const { return m_hasInvalidCSSAttributeTyp e; } 163 bool hasInvalidCSSAttributeType() const { return m_hasInvalidCSSAttributeTyp e; }
164 164
165 virtual void updateAnimationMode(); 165 virtual void updateAnimationMode();
166 void setAnimationMode(AnimationMode animationMode) { m_animationMode = anima tionMode; } 166 void setAnimationMode(AnimationMode animationMode) { m_animationMode = anima tionMode; }
167 void setCalcMode(CalcMode calcMode) { m_calcMode = calcMode; } 167 void setCalcMode(CalcMode calcMode) { m_calcMode = calcMode; }
168 168
169 private: 169 private:
170 virtual bool isValid() const OVERRIDE FINAL { return SVGTests::isValid(); } 170 virtual bool isValid() const override final { return SVGTests::isValid(); }
171 171
172 virtual void animationAttributeChanged() OVERRIDE; 172 virtual void animationAttributeChanged() override;
173 void setAttributeType(const AtomicString&); 173 void setAttributeType(const AtomicString&);
174 174
175 void checkInvalidCSSAttributeType(SVGElement*); 175 void checkInvalidCSSAttributeType(SVGElement*);
176 176
177 virtual bool calculateToAtEndOfDurationValue(const String& toAtEndOfDuration String) = 0; 177 virtual bool calculateToAtEndOfDurationValue(const String& toAtEndOfDuration String) = 0;
178 virtual bool calculateFromAndToValues(const String& fromString, const String & toString) = 0; 178 virtual bool calculateFromAndToValues(const String& fromString, const String & toString) = 0;
179 virtual bool calculateFromAndByValues(const String& fromString, const String & byString) = 0; 179 virtual bool calculateFromAndByValues(const String& fromString, const String & byString) = 0;
180 virtual void calculateAnimatedValue(float percent, unsigned repeatCount, SVG SMILElement* resultElement) = 0; 180 virtual void calculateAnimatedValue(float percent, unsigned repeatCount, SVG SMILElement* resultElement) = 0;
181 virtual float calculateDistance(const String& /*fromString*/, const String& /*toString*/) { return -1.f; } 181 virtual float calculateDistance(const String& /*fromString*/, const String& /*toString*/) { return -1.f; }
182 182
(...skipping 22 matching lines...) Expand all
205 String m_lastValuesAnimationFrom; 205 String m_lastValuesAnimationFrom;
206 String m_lastValuesAnimationTo; 206 String m_lastValuesAnimationTo;
207 bool m_hasInvalidCSSAttributeType; 207 bool m_hasInvalidCSSAttributeType;
208 CalcMode m_calcMode; 208 CalcMode m_calcMode;
209 AnimationMode m_animationMode; 209 AnimationMode m_animationMode;
210 }; 210 };
211 211
212 } // namespace blink 212 } // namespace blink
213 213
214 #endif // SVGAnimationElement_h 214 #endif // SVGAnimationElement_h
OLDNEW
« no previous file with comments | « Source/core/svg/SVGAnimatedTypeAnimator.h ('k') | Source/core/svg/SVGBoolean.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698