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

Unified Diff: Source/core/frame/animation/CSSPropertyAnimation.cpp

Issue 137943002: Update more core classes to use OVERRIDE / FINAL when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/DOMWindow.cpp ('k') | Source/core/html/HTMLInputElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/animation/CSSPropertyAnimation.cpp
diff --git a/Source/core/frame/animation/CSSPropertyAnimation.cpp b/Source/core/frame/animation/CSSPropertyAnimation.cpp
index 4390814267fd325ff0019a9a3727011c0d25f1bd..a6f0eb6be252a64f8ff979f05bd440f3c82a35c3 100644
--- a/Source/core/frame/animation/CSSPropertyAnimation.cpp
+++ b/Source/core/frame/animation/CSSPropertyAnimation.cpp
@@ -354,14 +354,14 @@ protected:
void (RenderStyle::*m_setter)(T);
};
-class NonNegativeLengthWrapper : public PropertyWrapper<Length> {
+class NonNegativeLengthWrapper FINAL : public PropertyWrapper<Length> {
public:
NonNegativeLengthWrapper(CSSPropertyID prop, Length (RenderStyle::*getter)() const, void (RenderStyle::*setter)(Length))
: PropertyWrapper<Length>(prop, getter, setter)
{
}
- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
+ virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const OVERRIDE
{
Length from = (a->*PropertyWrapperGetter<Length>::m_getter)();
Length to = (b->*PropertyWrapperGetter<Length>::m_getter)();
@@ -419,14 +419,14 @@ public:
}
};
-class StyleImagePropertyWrapper : public RefCountedPropertyWrapper<StyleImage> {
+class StyleImagePropertyWrapper FINAL : public RefCountedPropertyWrapper<StyleImage> {
public:
StyleImagePropertyWrapper(CSSPropertyID prop, StyleImage* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(PassRefPtr<StyleImage>))
: RefCountedPropertyWrapper<StyleImage>(prop, getter, setter)
{
}
- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
+ virtual bool equals(const RenderStyle* a, const RenderStyle* b) const OVERRIDE
{
// If the style pointers are the same, don't bother doing the test.
// If either is null, return false. If both are null, return true.
@@ -441,7 +441,7 @@ public:
}
};
-class PropertyWrapperColor : public PropertyWrapperGetter<Color> {
+class PropertyWrapperColor FINAL : public PropertyWrapperGetter<Color> {
public:
PropertyWrapperColor(CSSPropertyID prop, Color (RenderStyle::*getter)() const, void (RenderStyle::*setter)(const Color&))
: PropertyWrapperGetter<Color>(prop, getter)
@@ -449,7 +449,7 @@ public:
{
}
- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
+ virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const OVERRIDE
{
(dst->*m_setter)(blendFunc(anim, (a->*PropertyWrapperGetter<Color>::m_getter)(), (b->*PropertyWrapperGetter<Color>::m_getter)(), progress));
}
@@ -458,16 +458,16 @@ protected:
void (RenderStyle::*m_setter)(const Color&);
};
-class PropertyWrapperAcceleratedOpacity : public PropertyWrapper<float> {
+class PropertyWrapperAcceleratedOpacity FINAL : public PropertyWrapper<float> {
public:
PropertyWrapperAcceleratedOpacity()
: PropertyWrapper<float>(CSSPropertyOpacity, &RenderStyle::opacity, &RenderStyle::setOpacity)
{
}
- virtual bool animationIsAccelerated() const { return true; }
+ virtual bool animationIsAccelerated() const OVERRIDE { return true; }
- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
+ virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const OVERRIDE
{
float fromOpacity = a->opacity();
@@ -476,37 +476,37 @@ public:
}
};
-class PropertyWrapperAcceleratedTransform : public PropertyWrapper<const TransformOperations&> {
+class PropertyWrapperAcceleratedTransform FINAL : public PropertyWrapper<const TransformOperations&> {
public:
PropertyWrapperAcceleratedTransform()
: PropertyWrapper<const TransformOperations&>(CSSPropertyWebkitTransform, &RenderStyle::transform, &RenderStyle::setTransform)
{
}
- virtual bool animationIsAccelerated() const { return true; }
+ virtual bool animationIsAccelerated() const OVERRIDE { return true; }
- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
+ virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const OVERRIDE
{
dst->setTransform(blendFunc(anim, a->transform(), b->transform(), progress));
}
};
-class PropertyWrapperAcceleratedFilter : public PropertyWrapper<const FilterOperations&> {
+class PropertyWrapperAcceleratedFilter FINAL : public PropertyWrapper<const FilterOperations&> {
public:
PropertyWrapperAcceleratedFilter()
: PropertyWrapper<const FilterOperations&>(CSSPropertyWebkitFilter, &RenderStyle::filter, &RenderStyle::setFilter)
{
}
- virtual bool animationIsAccelerated() const { return true; }
+ virtual bool animationIsAccelerated() const OVERRIDE { return true; }
- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
+ virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const OVERRIDE
{
dst->setFilter(blendFunc(anim, a->filter(), b->filter(), progress));
}
};
-class PropertyWrapperShadow : public AnimationPropertyWrapperBase {
+class PropertyWrapperShadow FINAL : public AnimationPropertyWrapperBase {
public:
PropertyWrapperShadow(CSSPropertyID prop, ShadowList* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(PassRefPtr<ShadowList>))
: AnimationPropertyWrapperBase(prop)
@@ -515,7 +515,7 @@ public:
{
}
- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
+ virtual bool equals(const RenderStyle* a, const RenderStyle* b) const OVERRIDE
{
const ShadowList* shadowA = (a->*m_getter)();
const ShadowList* shadowB = (b->*m_getter)();
@@ -526,7 +526,7 @@ public:
return false;
}
- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
+ virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const OVERRIDE
{
(dst->*m_setter)(ShadowList::blend((a->*m_getter)(), (b->*m_getter)(), progress));
}
@@ -535,7 +535,7 @@ public:
void (RenderStyle::*m_setter)(PassRefPtr<ShadowList>);
};
-class PropertyWrapperMaybeInvalidColor : public AnimationPropertyWrapperBase {
+class PropertyWrapperMaybeInvalidColor FINAL : public AnimationPropertyWrapperBase {
public:
PropertyWrapperMaybeInvalidColor(CSSPropertyID prop, Color (RenderStyle::*getter)() const, void (RenderStyle::*setter)(const Color&))
: AnimationPropertyWrapperBase(prop)
@@ -544,7 +544,7 @@ public:
{
}
- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
+ virtual bool equals(const RenderStyle* a, const RenderStyle* b) const OVERRIDE
{
Color fromColor = (a->*m_getter)();
Color toColor = (b->*m_getter)();
@@ -560,7 +560,7 @@ public:
return fromColor == toColor;
}
- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
+ virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const OVERRIDE
{
Color fromColor = (a->*m_getter)();
Color toColor = (b->*m_getter)();
@@ -582,7 +582,7 @@ private:
enum MaybeInvalidColorTag { MaybeInvalidColor };
-class PropertyWrapperVisitedAffectedColor : public AnimationPropertyWrapperBase {
+class PropertyWrapperVisitedAffectedColor FINAL : public AnimationPropertyWrapperBase {
public:
PropertyWrapperVisitedAffectedColor(CSSPropertyID prop, Color (RenderStyle::*getter)() const, void (RenderStyle::*setter)(const Color&),
Color (RenderStyle::*visitedGetter)() const, void (RenderStyle::*visitedSetter)(const Color&))
@@ -598,11 +598,11 @@ public:
, m_visitedWrapper(adoptPtr(new PropertyWrapperMaybeInvalidColor(prop, visitedGetter, visitedSetter)))
{
}
- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
+ virtual bool equals(const RenderStyle* a, const RenderStyle* b) const OVERRIDE
{
return m_wrapper->equals(a, b) && m_visitedWrapper->equals(a, b);
}
- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
+ virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const OVERRIDE
{
m_wrapper->blend(anim, dst, a, b, progress);
m_visitedWrapper->blend(anim, dst, a, b, progress);
@@ -651,7 +651,7 @@ protected:
};
template <typename T>
-class FillLayerPropertyWrapper : public FillLayerPropertyWrapperGetter<T> {
+class FillLayerPropertyWrapper FINAL : public FillLayerPropertyWrapperGetter<T> {
public:
FillLayerPropertyWrapper(T (FillLayer::*getter)() const, void (FillLayer::*setter)(T))
: FillLayerPropertyWrapperGetter<T>(getter)
@@ -659,7 +659,7 @@ public:
{
}
- virtual void blend(const AnimationBase* anim, FillLayer* dst, const FillLayer* a, const FillLayer* b, double progress) const
+ virtual void blend(const AnimationBase* anim, FillLayer* dst, const FillLayer* a, const FillLayer* b, double progress) const OVERRIDE
{
(dst->*m_setter)(blendFunc(anim, (a->*FillLayerPropertyWrapperGetter<T>::m_getter)(), (b->*FillLayerPropertyWrapperGetter<T>::m_getter)(), progress));
}
@@ -686,14 +686,14 @@ protected:
void (FillLayer::*m_setter)(PassRefPtr<T>);
};
-class FillLayerStyleImagePropertyWrapper : public FillLayerRefCountedPropertyWrapper<StyleImage> {
+class FillLayerStyleImagePropertyWrapper FINAL : public FillLayerRefCountedPropertyWrapper<StyleImage> {
public:
FillLayerStyleImagePropertyWrapper(StyleImage* (FillLayer::*getter)() const, void (FillLayer::*setter)(PassRefPtr<StyleImage>))
: FillLayerRefCountedPropertyWrapper<StyleImage>(getter, setter)
{
}
- virtual bool equals(const FillLayer* a, const FillLayer* b) const
+ virtual bool equals(const FillLayer* a, const FillLayer* b) const OVERRIDE
{
// If the style pointers are the same, don't bother doing the test.
// If either is null, return false. If both are null, return true.
@@ -709,7 +709,7 @@ public:
};
-class FillLayersPropertyWrapper : public AnimationPropertyWrapperBase {
+class FillLayersPropertyWrapper FINAL : public AnimationPropertyWrapperBase {
public:
typedef const FillLayer* (RenderStyle::*LayersGetter)() const;
typedef FillLayer* (RenderStyle::*LayersAccessor)();
@@ -741,7 +741,7 @@ public:
}
}
- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
+ virtual bool equals(const RenderStyle* a, const RenderStyle* b) const OVERRIDE
{
const FillLayer* fromLayer = (a->*m_layersGetter)();
const FillLayer* toLayer = (b->*m_layersGetter)();
@@ -757,7 +757,7 @@ public:
return true;
}
- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
+ virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const OVERRIDE
{
const FillLayer* aLayer = (a->*m_layersGetter)();
const FillLayer* bLayer = (b->*m_layersGetter)();
@@ -778,7 +778,7 @@ private:
LayersAccessor m_layersAccessor;
};
-class ShorthandPropertyWrapper : public AnimationPropertyWrapperBase {
+class ShorthandPropertyWrapper FINAL : public AnimationPropertyWrapperBase {
public:
ShorthandPropertyWrapper(CSSPropertyID property, const StylePropertyShorthand& shorthand)
: AnimationPropertyWrapperBase(property)
@@ -790,9 +790,9 @@ public:
}
}
- virtual bool isShorthandWrapper() const { return true; }
+ virtual bool isShorthandWrapper() const OVERRIDE { return true; }
- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
+ virtual bool equals(const RenderStyle* a, const RenderStyle* b) const OVERRIDE
{
Vector<AnimationPropertyWrapperBase*>::const_iterator end = m_propertyWrappers.end();
for (Vector<AnimationPropertyWrapperBase*>::const_iterator it = m_propertyWrappers.begin(); it != end; ++it) {
@@ -802,7 +802,7 @@ public:
return true;
}
- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
+ virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const OVERRIDE
{
Vector<AnimationPropertyWrapperBase*>::const_iterator end = m_propertyWrappers.end();
for (Vector<AnimationPropertyWrapperBase*>::const_iterator it = m_propertyWrappers.begin(); it != end; ++it)
@@ -815,14 +815,14 @@ private:
Vector<AnimationPropertyWrapperBase*> m_propertyWrappers;
};
-class PropertyWrapperFlex : public AnimationPropertyWrapperBase {
+class PropertyWrapperFlex FINAL : public AnimationPropertyWrapperBase {
public:
PropertyWrapperFlex()
: AnimationPropertyWrapperBase(CSSPropertyFlex)
{
}
- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
+ virtual bool equals(const RenderStyle* a, const RenderStyle* b) const OVERRIDE
{
// If the style pointers are the same, don't bother doing the test.
// If either is null, return false. If both are null, return true.
@@ -834,7 +834,7 @@ public:
return a->flexBasis() == b->flexBasis() && a->flexGrow() == b->flexGrow() && a->flexShrink() == b->flexShrink();
}
- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
+ virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const OVERRIDE
{
dst->setFlexBasis(blendFunc(anim, a->flexBasis(), b->flexBasis(), progress));
dst->setFlexGrow(blendFunc(anim, a->flexGrow(), b->flexGrow(), progress));
@@ -842,7 +842,7 @@ public:
}
};
-class PropertyWrapperSVGPaint : public AnimationPropertyWrapperBase {
+class PropertyWrapperSVGPaint FINAL : public AnimationPropertyWrapperBase {
public:
PropertyWrapperSVGPaint(CSSPropertyID prop, const SVGPaint::SVGPaintType& (RenderStyle::*paintTypeGetter)() const, Color (RenderStyle::*getter)() const, void (RenderStyle::*setter)(const Color&))
: AnimationPropertyWrapperBase(prop)
@@ -852,7 +852,7 @@ public:
{
}
- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
+ virtual bool equals(const RenderStyle* a, const RenderStyle* b) const OVERRIDE
{
if ((a->*m_paintTypeGetter)() != (b->*m_paintTypeGetter)())
return false;
@@ -877,7 +877,7 @@ public:
return true;
}
- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
+ virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const OVERRIDE
{
if ((a->*m_paintTypeGetter)() != SVGPaint::SVG_PAINTTYPE_RGBCOLOR
|| (b->*m_paintTypeGetter)() != SVGPaint::SVG_PAINTTYPE_RGBCOLOR)
« no previous file with comments | « Source/core/frame/DOMWindow.cpp ('k') | Source/core/html/HTMLInputElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698