| Index: third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h
|
| diff --git a/third_party/WebKit/public/platform/WebFloatAnimationCurve.h b/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h
|
| similarity index 56%
|
| rename from third_party/WebKit/public/platform/WebFloatAnimationCurve.h
|
| rename to third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h
|
| index 74d9e8d278ae8e4a171388b3aa1b7ccd90f7f82e..d6c694d8fb02527d7664f16f66c0d54f2161865f 100644
|
| --- a/third_party/WebKit/public/platform/WebFloatAnimationCurve.h
|
| +++ b/third_party/WebKit/Source/platform/animation/CompositorFloatAnimationCurve.h
|
| @@ -22,38 +22,58 @@
|
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef WebFloatAnimationCurve_h
|
| -#define WebFloatAnimationCurve_h
|
| +#ifndef CompositorFloatAnimationCurve_h
|
| +#define CompositorFloatAnimationCurve_h
|
|
|
| -#include "WebCompositorAnimationCurve.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| +#include "platform/PlatformExport.h"
|
| +#include "platform/animation/CompositorAnimationCurve.h"
|
| +#include "platform/animation/CompositorFloatKeyframe.h"
|
| +#include "wtf/Noncopyable.h"
|
|
|
| -#include "WebCommon.h"
|
| -#include "WebFloatKeyframe.h"
|
| +namespace cc {
|
| +class AnimationCurve;
|
| +class KeyframedFloatAnimationCurve;
|
| +}
|
| +
|
| +namespace blink {
|
| +struct CompositorFloatKeyframe;
|
| +}
|
|
|
| namespace blink {
|
|
|
| // A keyframed float animation curve.
|
| -class WebFloatAnimationCurve : public WebCompositorAnimationCurve {
|
| +class PLATFORM_EXPORT CompositorFloatAnimationCurve : public CompositorAnimationCurve {
|
| + WTF_MAKE_NONCOPYABLE(CompositorFloatAnimationCurve);
|
| public:
|
| - virtual ~WebFloatAnimationCurve() { }
|
| + CompositorFloatAnimationCurve();
|
| + ~CompositorFloatAnimationCurve() override;
|
|
|
| // Adds the keyframe with the default timing function (ease).
|
| - virtual void add(const WebFloatKeyframe&) = 0;
|
| - virtual void add(const WebFloatKeyframe&, TimingFunctionType) = 0;
|
| + virtual void add(const CompositorFloatKeyframe&);
|
| + virtual void add(const CompositorFloatKeyframe&, TimingFunctionType);
|
| // Adds the keyframe with a custom, bezier timing function. Note, it is
|
| - // assumed that x0 = y0 = 0, and x3 = y3 = 1.
|
| - virtual void add(const WebFloatKeyframe&, double x1, double y1, double x2, double y2) = 0;
|
| + // assumed that x0 = y0 , and x3 = y3 = 1.
|
| + virtual void add(const CompositorFloatKeyframe&, double x1, double y1, double x2, double y2);
|
| // Adds the keyframe with a steps timing function.
|
| - virtual void add(const WebFloatKeyframe&, int steps, float stepsStartOffset) = 0;
|
| + virtual void add(const CompositorFloatKeyframe&, int steps, float stepsStartOffset);
|
| +
|
| + virtual void setLinearTimingFunction();
|
| + virtual void setCubicBezierTimingFunction(TimingFunctionType);
|
| + virtual void setCubicBezierTimingFunction(double x1, double y1, double x2, double y2);
|
| + virtual void setStepsTimingFunction(int numberOfSteps, float stepsStartOffset);
|
| +
|
| + virtual float getValue(double time) const;
|
| +
|
| + // CompositorAnimationCurve implementation.
|
| + AnimationCurveType type() const override;
|
|
|
| - virtual void setLinearTimingFunction() = 0;
|
| - virtual void setCubicBezierTimingFunction(TimingFunctionType) = 0;
|
| - virtual void setCubicBezierTimingFunction(double x1, double y1, double x2, double y2) = 0;
|
| - virtual void setStepsTimingFunction(int numberOfSteps, float stepsStartOffset) = 0;
|
| + scoped_ptr<cc::AnimationCurve> cloneToAnimationCurve() const;
|
|
|
| - virtual float getValue(double time) const = 0;
|
| +private:
|
| + scoped_ptr<cc::KeyframedFloatAnimationCurve> m_curve;
|
| };
|
|
|
| } // namespace blink
|
|
|
| -#endif // WebFloatAnimationCurve_h
|
| +#endif // CompositorFloatAnimationCurve_h
|
|
|