Index: Source/platform/transforms/RotateTransformOperation.h |
diff --git a/Source/platform/transforms/RotateTransformOperation.h b/Source/platform/transforms/RotateTransformOperation.h |
index 83cd81234706c1e392a9975353734f664ee7945b..661d4b43151a48b96ba43cf6fd9169c2fc3c68f4 100644 |
--- a/Source/platform/transforms/RotateTransformOperation.h |
+++ b/Source/platform/transforms/RotateTransformOperation.h |
@@ -46,11 +46,15 @@ public: |
double z() const { return m_z; } |
double angle() const { return m_angle; } |
-private: |
- virtual bool isIdentity() const OVERRIDE { return !m_angle; } |
+ FloatPoint3D axis() const; |
+ static bool shareSameAxis(const RotateTransformOperation* fromRotation, const RotateTransformOperation* toRotation, FloatPoint3D* axis, double* fromAngle, double* toAngle); |
+ virtual bool canBlendWith(const TransformOperation& other) const; |
virtual OperationType type() const OVERRIDE { return m_type; } |
+private: |
+ virtual bool isIdentity() const OVERRIDE { return !m_angle; } |
+ |
virtual bool operator==(const TransformOperation& o) const OVERRIDE |
{ |
if (!isSameType(o)) |