Index: third_party/WebKit/Source/platform/animation/WebTransformOperations.h |
diff --git a/third_party/WebKit/public/platform/WebTransformOperations.h b/third_party/WebKit/Source/platform/animation/WebTransformOperations.h |
similarity index 73% |
rename from third_party/WebKit/public/platform/WebTransformOperations.h |
rename to third_party/WebKit/Source/platform/animation/WebTransformOperations.h |
index a433f669fc31b0e9571eef4798c9500d054e4270..ada2d766853ee0e7bcd62d18ca8faf3d59e93ce8 100644 |
--- a/third_party/WebKit/public/platform/WebTransformOperations.h |
+++ b/third_party/WebKit/Source/platform/animation/WebTransformOperations.h |
@@ -25,33 +25,41 @@ |
#ifndef WebTransformOperations_h |
#define WebTransformOperations_h |
+#include "cc/animation/transform_operations.h" |
+#include "platform/PlatformExport.h" |
+ |
class SkMatrix44; |
#define WEB_TRANSFORM_OPERATIONS_IS_VIRTUAL 1 |
namespace blink { |
-class WebTransformOperations { |
+class PLATFORM_EXPORT WebTransformOperations { |
public: |
- virtual ~WebTransformOperations() { } |
+ WebTransformOperations(); |
+ virtual ~WebTransformOperations(); |
+ |
+ const cc::TransformOperations& AsTransformOperations() const; |
// Returns true if these operations can be blended. It will only return |
// false if we must resort to matrix interpolation, and matrix interpolation |
// fails (this can happen if either matrix cannot be decomposed). |
- virtual bool canBlendWith(const WebTransformOperations& other) const = 0; |
+ virtual bool canBlendWith(const WebTransformOperations& other) const; |
- virtual void appendTranslate(double x, double y, double z) = 0; |
- virtual void appendRotate(double x, double y, double z, double degrees) = 0; |
- virtual void appendScale(double x, double y, double z) = 0; |
- virtual void appendSkew(double x, double y) = 0; |
- virtual void appendPerspective(double depth) = 0; |
- virtual void appendMatrix(const SkMatrix44&) = 0; |
- virtual void appendIdentity() = 0; |
+ virtual void appendTranslate(double x, double y, double z); |
+ virtual void appendRotate(double x, double y, double z, double degrees); |
+ virtual void appendScale(double x, double y, double z); |
+ virtual void appendSkew(double x, double y); |
+ virtual void appendPerspective(double depth); |
+ virtual void appendMatrix(const SkMatrix44&); |
+ virtual void appendIdentity(); |
- virtual bool isIdentity() const = 0; |
+ virtual bool isIdentity() const; |
+ |
+private: |
+ cc::TransformOperations m_transformOperations; |
}; |
} // namespace blink |
#endif // WebTransformOperations_h |
- |