| Index: third_party/WebKit/Source/platform/animation/CompositorTransformAnimationCurve.h
|
| diff --git a/third_party/WebKit/public/platform/WebTransformAnimationCurve.h b/third_party/WebKit/Source/platform/animation/CompositorTransformAnimationCurve.h
|
| similarity index 56%
|
| rename from third_party/WebKit/public/platform/WebTransformAnimationCurve.h
|
| rename to third_party/WebKit/Source/platform/animation/CompositorTransformAnimationCurve.h
|
| index 4aba2820b1e235ff170ed7c0fb9e0fea1b387652..6ed78529664247178b286c50961d2732c8b71a87 100644
|
| --- a/third_party/WebKit/public/platform/WebTransformAnimationCurve.h
|
| +++ b/third_party/WebKit/Source/platform/animation/CompositorTransformAnimationCurve.h
|
| @@ -22,35 +22,56 @@
|
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef WebTransformAnimationCurve_h
|
| -#define WebTransformAnimationCurve_h
|
| +#ifndef CompositorTransformAnimationCurve_h
|
| +#define CompositorTransformAnimationCurve_h
|
|
|
| -#include "WebCommon.h"
|
| -#include "WebCompositorAnimationCurve.h"
|
| -#include "WebTransformKeyframe.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| +#include "platform/PlatformExport.h"
|
| +#include "platform/animation/CompositorAnimationCurve.h"
|
| +#include "platform/animation/CompositorTransformKeyframe.h"
|
| +#include "wtf/Noncopyable.h"
|
| +
|
| +namespace cc {
|
| +class AnimationCurve;
|
| +class KeyframedTransformAnimationCurve;
|
| +}
|
| +
|
| +namespace blink {
|
| +class CompositorTransformKeyframe;
|
| +}
|
|
|
| namespace blink {
|
|
|
| // A keyframed transform animation curve.
|
| -class WebTransformAnimationCurve : public WebCompositorAnimationCurve {
|
| +class PLATFORM_EXPORT CompositorTransformAnimationCurve : public CompositorAnimationCurve {
|
| + WTF_MAKE_NONCOPYABLE(CompositorTransformAnimationCurve);
|
| public:
|
| - virtual ~WebTransformAnimationCurve() { }
|
| + CompositorTransformAnimationCurve();
|
| + ~CompositorTransformAnimationCurve() override;
|
|
|
| // Adds the keyframe with the default timing function (ease).
|
| - virtual void add(const WebTransformKeyframe&) = 0;
|
| - virtual void add(const WebTransformKeyframe&, TimingFunctionType) = 0;
|
| + virtual void add(const CompositorTransformKeyframe&);
|
| + virtual void add(const CompositorTransformKeyframe&, 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 WebTransformKeyframe&, double x1, double y1, double x2, double y2) = 0;
|
| + // assumed that x0 = y0, and x3 = y3 = 1.
|
| + virtual void add(const CompositorTransformKeyframe&, double x1, double y1, double x2, double y2);
|
| // Adds the keyframe with a steps timing function.
|
| - virtual void add(const WebTransformKeyframe&, int steps, float stepsStartOffset) = 0;
|
| + virtual void add(const CompositorTransformKeyframe&, 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);
|
| +
|
| + // CompositorAnimationCurve implementation.
|
| + AnimationCurveType type() const override;
|
| +
|
| + scoped_ptr<cc::AnimationCurve> cloneToAnimationCurve() const;
|
|
|
| - 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;
|
| +private:
|
| + scoped_ptr<cc::KeyframedTransformAnimationCurve> m_curve;
|
| };
|
|
|
| } // namespace blink
|
|
|
| -#endif // WebTransformAnimationCurve_h
|
| +#endif // CompositorTransformAnimationCurve_h
|
|
|