third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h - Issue 2019613002: Blink Compositor Animation: Make Animation and Curve methods non-virtual.

Unified Diff: third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h

Issue 2019613002: Blink Compositor Animation: Make Animation and Curve methods non-virtual. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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

« third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp ('K') | « third_party/WebKit/Source/platform/animation/CompositorFilterAnimationCurve.h ('k') | third_party/WebKit/Source/platform/animation/CompositorScrollOffsetAnimationCurve.h » ('j') | third_party/WebKit/Source/platform/testing/CompositorAnimationsTestUtils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h

diff --git a/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h b/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h

index 1598fe57f2de6b0e025b7e7879f7ec6f110dd387..f991b397090fe00967737ee84148a5ebea111ce3 100644

--- a/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h

+++ b/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h

@@ -28,19 +28,19 @@ public:

CompositorFloatAnimationCurve();

~CompositorFloatAnimationCurve() override;

- virtual void addLinearKeyframe(const CompositorFloatKeyframe&);

- virtual void addCubicBezierKeyframe(const CompositorFloatKeyframe&, CubicBezierTimingFunction::EaseType);

+ void addLinearKeyframe(const CompositorFloatKeyframe&);

+ void addCubicBezierKeyframe(const CompositorFloatKeyframe&, CubicBezierTimingFunction::EaseType);

// Adds the keyframe with a custom, bezier timing function. Note, it is

// assumed that x0 = y0 , and x3 = y3 = 1.

- virtual void addCubicBezierKeyframe(const CompositorFloatKeyframe&, double x1, double y1, double x2, double y2);

- virtual void addStepsKeyframe(const CompositorFloatKeyframe&, int steps, StepsTimingFunction::StepPosition);

+ void addCubicBezierKeyframe(const CompositorFloatKeyframe&, double x1, double y1, double x2, double y2);

+ void addStepsKeyframe(const CompositorFloatKeyframe&, int steps, StepsTimingFunction::StepPosition);

- virtual void setLinearTimingFunction();

- virtual void setCubicBezierTimingFunction(CubicBezierTimingFunction::EaseType);

- virtual void setCubicBezierTimingFunction(double x1, double y1, double x2, double y2);

- virtual void setStepsTimingFunction(int numberOfSteps, StepsTimingFunction::StepPosition);

+ void setLinearTimingFunction();

+ void setCubicBezierTimingFunction(CubicBezierTimingFunction::EaseType);

+ void setCubicBezierTimingFunction(double x1, double y1, double x2, double y2);

+ void setStepsTimingFunction(int numberOfSteps, StepsTimingFunction::StepPosition);

- virtual float getValue(double time) const;

+ float getValue(double time) const;

// CompositorAnimationCurve implementation.

std::unique_ptr<cc::AnimationCurve> cloneToAnimationCurve() const override;