1 files changed, 6 insertions, 4 deletions
diff --git a/chromium/third_party/WebKit/Source/platform/transforms/ScaleTransformOperation.h b/chromium/third_party/WebKit/Source/platform/transforms/ScaleTransformOperation.h
index bcc93eeffb8..fa21c8fe99e 100644
--- a/chromium/third_party/WebKit/Source/platform/transforms/ScaleTransformOperation.h
+++ b/chromium/third_party/WebKit/Source/platform/transforms/ScaleTransformOperation.h
@@ -45,12 +45,14 @@ public:
     double y() const { return m_y; }
     double z() const { return m_z; }
 
+    virtual bool canBlendWith(const TransformOperation& other) const;
+
 private:
-    virtual bool isIdentity() const { return m_x == 1 &&  m_y == 1 &&  m_z == 1; }
+    virtual bool isIdentity() const OVERRIDE { return m_x == 1 &&  m_y == 1 &&  m_z == 1; }
 
     virtual OperationType type() const OVERRIDE { return m_type; }
 
-    virtual bool operator==(const TransformOperation& o) const
+    virtual bool operator==(const TransformOperation& o) const OVERRIDE
     {
         if (!isSameType(o))
             return false;
@@ -58,12 +60,12 @@ private:
         return m_x == s->m_x && m_y == s->m_y && m_z == s->m_z;
     }
 
-    virtual void apply(TransformationMatrix& transform, const FloatSize&) const
+    virtual void apply(TransformationMatrix& transform, const FloatSize&) const OVERRIDE
     {
         transform.scale3d(m_x, m_y, m_z);
     }
 
-    virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false);
+    virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) OVERRIDE;
 
     ScaleTransformOperation(double sx, double sy, double sz, OperationType type)
         : m_x(sx)