Index: third_party/WebKit/Source/platform/animation/CompositorFilterAnimationCurve.h |
diff --git a/third_party/WebKit/public/platform/WebFilterAnimationCurve.h b/third_party/WebKit/Source/platform/animation/CompositorFilterAnimationCurve.h |
similarity index 60% |
rename from third_party/WebKit/public/platform/WebFilterAnimationCurve.h |
rename to third_party/WebKit/Source/platform/animation/CompositorFilterAnimationCurve.h |
index 7126a8fd52a11bdf6268aac6e668d3c73f96108a..f470633b8282c29cedacba0d9fef6cdc04ef9e0d 100644 |
--- a/third_party/WebKit/public/platform/WebFilterAnimationCurve.h |
+++ b/third_party/WebKit/Source/platform/animation/CompositorFilterAnimationCurve.h |
@@ -28,34 +28,52 @@ |
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#ifndef WebFilterAnimationCurve_h |
-#define WebFilterAnimationCurve_h |
+#ifndef CompositorFilterAnimationCurve_h |
+#define CompositorFilterAnimationCurve_h |
-#include "WebCompositorAnimationCurve.h" |
+#include "base/memory/scoped_ptr.h" |
+#include "platform/PlatformExport.h" |
+#include "platform/animation/CompositorAnimationCurve.h" |
+#include "platform/animation/CompositorFilterKeyframe.h" |
-#include "WebCommon.h" |
-#include "WebFilterKeyframe.h" |
+namespace cc { |
+class AnimationCurve; |
+class KeyframedFilterAnimationCurve; |
+} |
+ |
+namespace blink { |
+class CompositorFilterKeyframe; |
+} |
namespace blink { |
// A keyframed filter animation curve. |
-class WebFilterAnimationCurve : public WebCompositorAnimationCurve { |
+class PLATFORM_EXPORT CompositorFilterAnimationCurve : public CompositorAnimationCurve { |
public: |
- virtual ~WebFilterAnimationCurve() { } |
+ CompositorFilterAnimationCurve(); |
+ ~CompositorFilterAnimationCurve() override; |
- virtual void add(const WebFilterKeyframe&, TimingFunctionType = TimingFunctionTypeEase) = 0; |
+ virtual void add(const CompositorFilterKeyframe&, TimingFunctionType = TimingFunctionTypeEase); |
// 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 WebFilterKeyframe&, double x1, double y1, double x2, double y2) = 0; |
+ // assumed that x0 = y0, and x3 = y3 = 1. |
+ virtual void add(const CompositorFilterKeyframe&, double x1, double y1, double x2, double y2); |
// Adds the keyframe with a steps timing function. |
- virtual void add(const WebFilterKeyframe&, int steps, float stepsStartOffset) = 0; |
+ virtual void add(const CompositorFilterKeyframe&, 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); |
+ |
+ // blink::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::KeyframedFilterAnimationCurve> m_curve; |
}; |
} // namespace blink |
-#endif // WebFilterAnimationCurve_h |
+#endif // CompositorFilterAnimationCurve_h |