OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 27 matching lines...) Expand all Loading... |
38 | 38 |
39 const ScaleTransformOperation* fromOp = static_cast<const ScaleTransformOper
ation*>(from); | 39 const ScaleTransformOperation* fromOp = static_cast<const ScaleTransformOper
ation*>(from); |
40 double fromX = fromOp ? fromOp->m_x : 1.0; | 40 double fromX = fromOp ? fromOp->m_x : 1.0; |
41 double fromY = fromOp ? fromOp->m_y : 1.0; | 41 double fromY = fromOp ? fromOp->m_y : 1.0; |
42 double fromZ = fromOp ? fromOp->m_z : 1.0; | 42 double fromZ = fromOp ? fromOp->m_z : 1.0; |
43 return ScaleTransformOperation::create(WebCore::blend(fromX, m_x, progress), | 43 return ScaleTransformOperation::create(WebCore::blend(fromX, m_x, progress), |
44 WebCore::blend(fromY, m_y, progress), | 44 WebCore::blend(fromY, m_y, progress), |
45 WebCore::blend(fromZ, m_z, progress),
m_type); | 45 WebCore::blend(fromZ, m_z, progress),
m_type); |
46 } | 46 } |
47 | 47 |
| 48 |
| 49 bool ScaleTransformOperation::canBlendWith(const TransformOperation& other) cons
t |
| 50 { |
| 51 return other.type() == ScaleX |
| 52 || other.type() == ScaleY |
| 53 || other.type() == ScaleZ |
| 54 || other.type() == Scale3D |
| 55 || other.type() == Scale; |
| 56 } |
| 57 |
48 } // namespace WebCore | 58 } // namespace WebCore |
OLD | NEW |