Index: third_party/WebKit/Source/platform/animation/CompositorTransformOperations.h |
diff --git a/third_party/WebKit/public/platform/WebTransformOperations.h b/third_party/WebKit/Source/platform/animation/CompositorTransformOperations.h |
similarity index 63% |
rename from third_party/WebKit/public/platform/WebTransformOperations.h |
rename to third_party/WebKit/Source/platform/animation/CompositorTransformOperations.h |
index a433f669fc31b0e9571eef4798c9500d054e4270..8238dceba4451aa8518f03cb0f824f6ec52d0095 100644 |
--- a/third_party/WebKit/public/platform/WebTransformOperations.h |
+++ b/third_party/WebKit/Source/platform/animation/CompositorTransformOperations.h |
@@ -22,36 +22,44 @@ |
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#ifndef WebTransformOperations_h |
-#define WebTransformOperations_h |
+#ifndef CompositorTransformOperations_h |
+#define CompositorTransformOperations_h |
-class SkMatrix44; |
+#include "cc/animation/transform_operations.h" |
+#include "platform/PlatformExport.h" |
+#include "wtf/Noncopyable.h" |
-#define WEB_TRANSFORM_OPERATIONS_IS_VIRTUAL 1 |
+class SkMatrix44; |
namespace blink { |
-class WebTransformOperations { |
+class PLATFORM_EXPORT CompositorTransformOperations { |
+ WTF_MAKE_NONCOPYABLE(CompositorTransformOperations); |
public: |
- virtual ~WebTransformOperations() { } |
+ CompositorTransformOperations(); |
+ virtual ~CompositorTransformOperations(); |
+ |
+ 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 CompositorTransformOperations& 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 |
- |
+#endif // CompositorTransformOperations_h |