Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / transforms / MatrixTransformOperation.h

diff --git a/src/third_party/WebKit/Source/platform/transforms/MatrixTransformOperation.h b/src/third_party/WebKit/Source/platform/transforms/MatrixTransformOperation.h
index ce842c1..d6865a2 100644 (file)
--- a/src/third_party/WebKit/Source/platform/transforms/MatrixTransformOperation.h
+++ b/src/third_party/WebKit/Source/platform/transforms/MatrixTransformOperation.h
@@ -28,7 +28,7 @@
 #include "platform/transforms/TransformOperation.h"
 #include "platform/transforms/TransformationMatrix.h"
 
-namespace WebCore {
+namespace blink {
 
 class PLATFORM_EXPORT MatrixTransformOperation : public TransformOperation {
 public:
@@ -44,12 +44,15 @@ public:
 
     TransformationMatrix matrix() const { return TransformationMatrix(m_a, m_b, m_c, m_d, m_e, m_f); }
 
-private:
-    virtual bool isIdentity() const OVERRIDE { return m_a == 1 && !m_b && !m_c && m_d == 1 && !m_e && !m_f; }
+    virtual bool canBlendWith(const TransformOperation& other) const
+    {
+        return false;
+    }
 
-    virtual OperationType type() const OVERRIDE { return Matrix; }
+private:
+    virtual OperationType type() const override { return Matrix; }
 
-    virtual bool operator==(const TransformOperation& o) const OVERRIDE
+    virtual bool operator==(const TransformOperation& o) const override
     {
         if (!isSameType(o))
             return false;
@@ -58,13 +61,13 @@ private:
         return m_a == m->m_a && m_b == m->m_b && m_c == m->m_c && m_d == m->m_d && m_e == m->m_e && m_f == m->m_f;
     }
 
-    virtual void apply(TransformationMatrix& transform, const FloatSize&) const OVERRIDE
+    virtual void apply(TransformationMatrix& transform, const FloatSize&) const override
     {
         TransformationMatrix matrix(m_a, m_b, m_c, m_d, m_e, m_f);
         transform.multiply(matrix);
     }
 
-    virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) OVERRIDE;
+    virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
 
     MatrixTransformOperation(double a, double b, double c, double d, double e, double f)
         : m_a(a)
@@ -94,6 +97,6 @@ private:
     double m_f;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // MatrixTransformOperation_h