| 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 29 matching lines...) Expand all  Loading... | 
| 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 | 49 | 
|  | 50     virtual void apply(TransformationMatrix& transform, const FloatSize&) const 
    override | 
|  | 51     { | 
|  | 52         transform.scale3d(m_x, m_y, m_z); | 
|  | 53     } | 
|  | 54 | 
| 50 private: | 55 private: | 
| 51     virtual OperationType type() const override { return m_type; } | 56     virtual OperationType type() const override { return m_type; } | 
| 52 | 57 | 
| 53     virtual bool operator==(const TransformOperation& o) const override | 58     virtual bool operator==(const TransformOperation& o) const override | 
| 54     { | 59     { | 
| 55         if (!isSameType(o)) | 60         if (!isSameType(o)) | 
| 56             return false; | 61             return false; | 
| 57         const ScaleTransformOperation* s = static_cast<const ScaleTransformOpera
    tion*>(&o); | 62         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; | 63         return m_x == s->m_x && m_y == s->m_y && m_z == s->m_z; | 
| 59     } | 64     } | 
| 60 | 65 | 
| 61     virtual void apply(TransformationMatrix& transform, const FloatSize&) const 
    override |  | 
| 62     { |  | 
| 63         transform.scale3d(m_x, m_y, m_z); |  | 
| 64     } |  | 
| 65 |  | 
| 66     virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from,
     double progress, bool blendToIdentity = false) override; | 66     virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from,
     double progress, bool blendToIdentity = false) override; | 
| 67 | 67 | 
| 68     ScaleTransformOperation(double sx, double sy, double sz, OperationType type) | 68     ScaleTransformOperation(double sx, double sy, double sz, OperationType type) | 
| 69         : m_x(sx) | 69         : m_x(sx) | 
| 70         , m_y(sy) | 70         , m_y(sy) | 
| 71         , m_z(sz) | 71         , m_z(sz) | 
| 72         , m_type(type) | 72         , m_type(type) | 
| 73     { | 73     { | 
| 74         ASSERT(type == ScaleX || type == ScaleY || type == ScaleZ || type == Sca
    le || type == Scale3D); | 74         ASSERT(type == ScaleX || type == ScaleY || type == ScaleZ || type == Sca
    le || type == Scale3D); | 
| 75     } | 75     } | 
| 76 | 76 | 
| 77     double m_x; | 77     double m_x; | 
| 78     double m_y; | 78     double m_y; | 
| 79     double m_z; | 79     double m_z; | 
| 80     OperationType m_type; | 80     OperationType m_type; | 
| 81 }; | 81 }; | 
| 82 | 82 | 
| 83 } // namespace blink | 83 } // namespace blink | 
| 84 | 84 | 
| 85 #endif // ScaleTransformOperation_h | 85 #endif // ScaleTransformOperation_h | 
| OLD | NEW | 
|---|