Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/Source/platform/transforms/ScaleTransformOperation.h b/src/third_party/WebKit/Source/platform/transforms/ScaleTransformOperation.h
index b2fd67b..608e223 100644 (file)
--- a/src/third_party/WebKit/Source/platform/transforms/ScaleTransformOperation.h
+++ b/src/third_party/WebKit/Source/platform/transforms/ScaleTransformOperation.h
@@ -27,7 +27,7 @@
 
 #include "platform/transforms/TransformOperation.h"
 
-namespace WebCore {
+namespace blink {
 
 class PLATFORM_EXPORT ScaleTransformOperation : public TransformOperation {
 public:
@@ -45,9 +45,9 @@ public:
     double y() const { return m_y; }
     double z() const { return m_z; }
 
-private:
-    virtual bool isIdentity() const OVERRIDE { return m_x == 1 &&  m_y == 1 &&  m_z == 1; }
+    virtual bool canBlendWith(const TransformOperation& other) const;
 
+private:
     virtual OperationType type() const OVERRIDE { return m_type; }
 
     virtual bool operator==(const TransformOperation& o) const OVERRIDE
@@ -80,6 +80,6 @@ private:
     OperationType m_type;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // ScaleTransformOperation_h