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

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

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ScrollAnimatorCompositorCoordinator for MSVC. Created 4 years, 11 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
Index: third_party/WebKit/Source/platform/animation/WebFilterAnimationCurve.h
diff --git a/third_party/WebKit/public/platform/WebFilterAnimationCurve.h b/third_party/WebKit/Source/platform/animation/WebFilterAnimationCurve.h
similarity index 71%
rename from third_party/WebKit/public/platform/WebFilterAnimationCurve.h
rename to third_party/WebKit/Source/platform/animation/WebFilterAnimationCurve.h
index 7126a8fd52a11bdf6268aac6e668d3c73f96108a..fcfd4571aaae5332ad57a8e2f42162bdf8b8393e 100644
--- a/third_party/WebKit/public/platform/WebFilterAnimationCurve.h
+++ b/third_party/WebKit/Source/platform/animation/WebFilterAnimationCurve.h
@@ -31,29 +31,47 @@
#ifndef WebFilterAnimationCurve_h
#define WebFilterAnimationCurve_h
-#include "WebCompositorAnimationCurve.h"
+#include "base/memory/scoped_ptr.h"
+#include "platform/PlatformExport.h"
+#include "platform/animation/WebCompositorAnimationCurve.h"
+#include "platform/animation/WebFilterKeyframe.h"
-#include "WebCommon.h"
-#include "WebFilterKeyframe.h"
+namespace cc {
+class AnimationCurve;
+class KeyframedFilterAnimationCurve;
+}
+
+namespace blink {
+class WebFilterKeyframe;
+}
namespace blink {
// A keyframed filter animation curve.
-class WebFilterAnimationCurve : public WebCompositorAnimationCurve {
+class PLATFORM_EXPORT WebFilterAnimationCurve : public WebCompositorAnimationCurve {
public:
- virtual ~WebFilterAnimationCurve() { }
+ WebFilterAnimationCurve();
+ ~WebFilterAnimationCurve() override;
- virtual void add(const WebFilterKeyframe&, TimingFunctionType = TimingFunctionTypeEase) = 0;
+ virtual void add(const WebFilterKeyframe&, 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 WebFilterKeyframe&, 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 WebFilterKeyframe&, 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::WebCompositorAnimationCurve 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

Powered by Google App Engine
This is Rietveld 408576698