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

Unified Diff: cc/test/animation_test_common.h

Issue 645853008: Standardize usage of virtual/override/final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatted 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/surfaces/surfaces_pixeltest.cc ('k') | cc/test/cc_test_suite.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/animation_test_common.h
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h
index 7b53c48080445ab8a34df4c7c221c13982c0540f..328ae840f2270c30dcb067241398a4eec8fb4566 100644
--- a/cc/test/animation_test_common.h
+++ b/cc/test/animation_test_common.h
@@ -24,11 +24,11 @@ class FakeFloatAnimationCurve : public FloatAnimationCurve {
public:
FakeFloatAnimationCurve();
explicit FakeFloatAnimationCurve(double duration);
- virtual ~FakeFloatAnimationCurve();
+ ~FakeFloatAnimationCurve() override;
- virtual double Duration() const override;
- virtual float GetValue(double now) const override;
- virtual scoped_ptr<AnimationCurve> Clone() const override;
+ double Duration() const override;
+ float GetValue(double now) const override;
+ scoped_ptr<AnimationCurve> Clone() const override;
private:
double duration_;
@@ -37,18 +37,18 @@ class FakeFloatAnimationCurve : public FloatAnimationCurve {
class FakeTransformTransition : public TransformAnimationCurve {
public:
explicit FakeTransformTransition(double duration);
- virtual ~FakeTransformTransition();
+ ~FakeTransformTransition() override;
- virtual double Duration() const override;
- virtual gfx::Transform GetValue(double time) const override;
- virtual bool AnimatedBoundsForBox(const gfx::BoxF& box,
- gfx::BoxF* bounds) const override;
- virtual bool AffectsScale() const override;
- virtual bool IsTranslation() const override;
- virtual bool MaximumTargetScale(bool forward_direction,
- float* max_scale) const override;
+ double Duration() const override;
+ gfx::Transform GetValue(double time) const override;
+ bool AnimatedBoundsForBox(const gfx::BoxF& box,
+ gfx::BoxF* bounds) const override;
+ bool AffectsScale() const override;
+ bool IsTranslation() const override;
+ bool MaximumTargetScale(bool forward_direction,
+ float* max_scale) const override;
- virtual scoped_ptr<AnimationCurve> Clone() const override;
+ scoped_ptr<AnimationCurve> Clone() const override;
private:
double duration_;
@@ -57,12 +57,12 @@ class FakeTransformTransition : public TransformAnimationCurve {
class FakeFloatTransition : public FloatAnimationCurve {
public:
FakeFloatTransition(double duration, float from, float to);
- virtual ~FakeFloatTransition();
+ ~FakeFloatTransition() override;
- virtual double Duration() const override;
- virtual float GetValue(double time) const override;
+ double Duration() const override;
+ float GetValue(double time) const override;
- virtual scoped_ptr<AnimationCurve> Clone() const override;
+ scoped_ptr<AnimationCurve> Clone() const override;
private:
double duration_;
@@ -73,16 +73,15 @@ class FakeFloatTransition : public FloatAnimationCurve {
class FakeLayerAnimationValueObserver : public LayerAnimationValueObserver {
public:
FakeLayerAnimationValueObserver();
- virtual ~FakeLayerAnimationValueObserver();
+ ~FakeLayerAnimationValueObserver() override;
// LayerAnimationValueObserver implementation
- virtual void OnFilterAnimated(const FilterOperations& filters) override;
- virtual void OnOpacityAnimated(float opacity) override;
- virtual void OnTransformAnimated(const gfx::Transform& transform) override;
- virtual void OnScrollOffsetAnimated(
- const gfx::ScrollOffset& scroll_offset) override;
- virtual void OnAnimationWaitingForDeletion() override;
- virtual bool IsActive() const override;
+ void OnFilterAnimated(const FilterOperations& filters) override;
+ void OnOpacityAnimated(float opacity) override;
+ void OnTransformAnimated(const gfx::Transform& transform) override;
+ void OnScrollOffsetAnimated(const gfx::ScrollOffset& scroll_offset) override;
+ void OnAnimationWaitingForDeletion() override;
+ bool IsActive() const override;
const FilterOperations& filters() const { return filters_; }
float opacity() const { return opacity_; }
@@ -104,12 +103,12 @@ class FakeLayerAnimationValueObserver : public LayerAnimationValueObserver {
class FakeInactiveLayerAnimationValueObserver
: public FakeLayerAnimationValueObserver {
public:
- virtual bool IsActive() const override;
+ bool IsActive() const override;
};
class FakeLayerAnimationValueProvider : public LayerAnimationValueProvider {
public:
- virtual gfx::ScrollOffset ScrollOffsetForAnimation() const override;
+ gfx::ScrollOffset ScrollOffsetForAnimation() const override;
void set_scroll_offset(const gfx::ScrollOffset& scroll_offset) {
scroll_offset_ = scroll_offset;
« no previous file with comments | « cc/surfaces/surfaces_pixeltest.cc ('k') | cc/test/cc_test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698