 Chromium Code Reviews
 Chromium Code Reviews Issue 1158603003:
  CSS Independent Transform Properties  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/blink.git@master
    
  
    Issue 1158603003:
  CSS Independent Transform Properties  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW | 
|---|---|
| 1 /* | 1 /* | 
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 
| 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 
| 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 
| 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 
| 7 * | 7 * | 
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or | 
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public | 
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either | 
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 * | 22 * | 
| 23 */ | 23 */ | 
| 24 | 24 | 
| 25 #ifndef ScaleTransformOperation_h | 25 #ifndef ScaleTransformOperation_h | 
| 26 #define ScaleTransformOperation_h | 26 #define ScaleTransformOperation_h | 
| 27 | 27 | 
| 28 #include "platform/transforms/TransformOperation.h" | 28 #include "platform/transforms/TransformOperation.h" | 
| 29 | 29 | 
| 30 namespace blink { | 30 namespace blink { | 
| 31 | 31 | 
| 32 class PLATFORM_EXPORT ScaleTransformOperation : public TransformOperation { | 32 class PLATFORM_EXPORT ScaleTransformOperation final : public TransformOperation { | 
| 33 public: | 33 public: | 
| 34 static PassRefPtr<ScaleTransformOperation> create(double sx, double sy, Oper ationType type) | 34 static PassRefPtr<ScaleTransformOperation> create(double sx, double sy, Oper ationType type) | 
| 35 { | 35 { | 
| 36 return adoptRef(new ScaleTransformOperation(sx, sy, 1, type)); | 36 return adoptRef(new ScaleTransformOperation(sx, sy, 1, type)); | 
| 37 } | 37 } | 
| 38 | 38 | 
| 39 static PassRefPtr<ScaleTransformOperation> create(double sx, double sy, doub le sz, OperationType type) | 39 static PassRefPtr<ScaleTransformOperation> create(double sx, double sy, doub le sz, OperationType type) | 
| 40 { | 40 { | 
| 41 return adoptRef(new ScaleTransformOperation(sx, sy, sz, type)); | 41 return adoptRef(new ScaleTransformOperation(sx, sy, sz, type)); | 
| 42 } | 42 } | 
| 43 | 43 | 
| 44 double x() const { return m_x; } | 44 double x() const { return m_x; } | 
| 45 double y() const { return m_y; } | 45 double y() const { return m_y; } | 
| 46 double z() const { return m_z; } | 46 double z() const { return m_z; } | 
| 47 | 47 | 
| 48 virtual bool canBlendWith(const TransformOperation& other) const; | 48 virtual bool canBlendWith(const TransformOperation& other) const; | 
| 49 | |
| 50 private: | |
| 51 virtual OperationType type() const override { return m_type; } | 49 virtual OperationType type() const override { return m_type; } | 
| 
Timothy Loh
2015/06/12 04:48:35
Can this (and the one for Translate) stay private?
 
soonm
2015/06/12 06:18:49
Yep they can be private. Reverted.
 | |
| 52 | 50 | 
| 53 virtual bool operator==(const TransformOperation& o) const override | 51 virtual bool operator==(const TransformOperation& o) const override | 
| 54 { | 52 { | 
| 55 if (!isSameType(o)) | 53 if (!isSameType(o)) | 
| 56 return false; | 54 return false; | 
| 57 const ScaleTransformOperation* s = static_cast<const ScaleTransformOpera tion*>(&o); | 55 const ScaleTransformOperation* s = static_cast<const ScaleTransformOpera tion*>(&o); | 
| 58 return m_x == s->m_x && m_y == s->m_y && m_z == s->m_z; | 56 return m_x == s->m_x && m_y == s->m_y && m_z == s->m_z; | 
| 59 } | 57 } | 
| 60 | 58 | 
| 59 private: | |
| 61 virtual void apply(TransformationMatrix& transform, const FloatSize&) const override | 60 virtual void apply(TransformationMatrix& transform, const FloatSize&) const override | 
| 62 { | 61 { | 
| 63 transform.scale3d(m_x, m_y, m_z); | 62 transform.scale3d(m_x, m_y, m_z); | 
| 64 } | 63 } | 
| 65 | 64 | 
| 66 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override; | 65 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override; | 
| 67 | 66 | 
| 68 ScaleTransformOperation(double sx, double sy, double sz, OperationType type) | 67 ScaleTransformOperation(double sx, double sy, double sz, OperationType type) | 
| 69 : m_x(sx) | 68 : m_x(sx) | 
| 70 , m_y(sy) | 69 , m_y(sy) | 
| 71 , m_z(sz) | 70 , m_z(sz) | 
| 72 , m_type(type) | 71 , m_type(type) | 
| 73 { | 72 { | 
| 74 ASSERT(type == ScaleX || type == ScaleY || type == ScaleZ || type == Sca le || type == Scale3D); | 73 ASSERT(type == ScaleX || type == ScaleY || type == ScaleZ || type == Sca le || type == Scale3D); | 
| 75 } | 74 } | 
| 76 | 75 | 
| 77 double m_x; | 76 double m_x; | 
| 78 double m_y; | 77 double m_y; | 
| 79 double m_z; | 78 double m_z; | 
| 80 OperationType m_type; | 79 OperationType m_type; | 
| 81 }; | 80 }; | 
| 82 | 81 | 
| 82 DEFINE_TRANSFORM_TYPE_CASTS(ScaleTransformOperation, isScaleTransformOperation() ); | |
| 83 | |
| 83 } // namespace blink | 84 } // namespace blink | 
| 84 | 85 | 
| 85 #endif // ScaleTransformOperation_h | 86 #endif // ScaleTransformOperation_h | 
| OLD | NEW |