| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 45 | 45 | 
| 46     virtual bool canBlendWith(const TransformOperation& other) const; | 46     virtual bool canBlendWith(const TransformOperation& other) const; | 
| 47 | 47 | 
| 48     double x(const FloatSize& borderBoxSize) const { return floatValueForLength(
    m_x, borderBoxSize.width()); } | 48     double x(const FloatSize& borderBoxSize) const { return floatValueForLength(
    m_x, borderBoxSize.width()); } | 
| 49     double y(const FloatSize& borderBoxSize) const { return floatValueForLength(
    m_y, borderBoxSize.height()); } | 49     double y(const FloatSize& borderBoxSize) const { return floatValueForLength(
    m_y, borderBoxSize.height()); } | 
| 50 | 50 | 
| 51     Length x() const { return m_x; } | 51     Length x() const { return m_x; } | 
| 52     Length y() const { return m_y; } | 52     Length y() const { return m_y; } | 
| 53     double z() const { return m_z; } | 53     double z() const { return m_z; } | 
| 54 | 54 | 
|  | 55     virtual void apply(TransformationMatrix& transform, const FloatSize& borderB
    oxSize) const override | 
|  | 56     { | 
|  | 57         transform.translate3d(x(borderBoxSize), y(borderBoxSize), z()); | 
|  | 58     } | 
|  | 59 | 
| 55 private: | 60 private: | 
| 56     virtual OperationType type() const override { return m_type; } | 61     virtual OperationType type() const override { return m_type; } | 
| 57 | 62 | 
| 58     virtual bool operator==(const TransformOperation& o) const override | 63     virtual bool operator==(const TransformOperation& o) const override | 
| 59     { | 64     { | 
| 60         if (!isSameType(o)) | 65         if (!isSameType(o)) | 
| 61             return false; | 66             return false; | 
| 62         const TranslateTransformOperation* t = static_cast<const TranslateTransf
    ormOperation*>(&o); | 67         const TranslateTransformOperation* t = static_cast<const TranslateTransf
    ormOperation*>(&o); | 
| 63         return m_x == t->m_x && m_y == t->m_y && m_z == t->m_z; | 68         return m_x == t->m_x && m_y == t->m_y && m_z == t->m_z; | 
| 64     } | 69     } | 
| 65 | 70 | 
| 66     virtual void apply(TransformationMatrix& transform, const FloatSize& borderB
    oxSize) const override |  | 
| 67     { |  | 
| 68         transform.translate3d(x(borderBoxSize), y(borderBoxSize), z()); |  | 
| 69     } |  | 
| 70 |  | 
| 71     virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from,
     double progress, bool blendToIdentity = false) override; | 71     virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from,
     double progress, bool blendToIdentity = false) override; | 
| 72 | 72 | 
| 73     virtual bool dependsOnBoxSize() const override | 73     virtual bool dependsOnBoxSize() const override | 
| 74     { | 74     { | 
| 75         return m_x.hasPercent() || m_y.hasPercent(); | 75         return m_x.hasPercent() || m_y.hasPercent(); | 
| 76     } | 76     } | 
| 77 | 77 | 
| 78     TranslateTransformOperation(const Length& tx, const Length& ty, double tz, O
    perationType type) | 78     TranslateTransformOperation(const Length& tx, const Length& ty, double tz, O
    perationType type) | 
| 79         : m_x(tx) | 79         : m_x(tx) | 
| 80         , m_y(ty) | 80         , m_y(ty) | 
| 81         , m_z(tz) | 81         , m_z(tz) | 
| 82         , m_type(type) | 82         , m_type(type) | 
| 83     { | 83     { | 
| 84         ASSERT(type == TranslateX || type == TranslateY || type == TranslateZ ||
     type == Translate || type == Translate3D); | 84         ASSERT(type == TranslateX || type == TranslateY || type == TranslateZ ||
     type == Translate || type == Translate3D); | 
| 85     } | 85     } | 
| 86 | 86 | 
| 87     Length m_x; | 87     Length m_x; | 
| 88     Length m_y; | 88     Length m_y; | 
| 89     double m_z; | 89     double m_z; | 
| 90     OperationType m_type; | 90     OperationType m_type; | 
| 91 }; | 91 }; | 
| 92 | 92 | 
| 93 } // namespace blink | 93 } // namespace blink | 
| 94 | 94 | 
| 95 #endif // TranslateTransformOperation_h | 95 #endif // TranslateTransformOperation_h | 
| OLD | NEW | 
|---|