| 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 22 matching lines...) Expand all Loading... |
| 33 if (blendToIdentity) | 33 if (blendToIdentity) |
| 34 return TranslateTransformOperation::create(zeroLength.blend(m_x, progres
s, ValueRangeAll), zeroLength.blend(m_y, progress, ValueRangeAll), WebCore::blen
d(0., m_z, progress), m_type); | 34 return TranslateTransformOperation::create(zeroLength.blend(m_x, progres
s, ValueRangeAll), zeroLength.blend(m_y, progress, ValueRangeAll), WebCore::blen
d(0., m_z, progress), m_type); |
| 35 | 35 |
| 36 const TranslateTransformOperation* fromOp = static_cast<const TranslateTrans
formOperation*>(from); | 36 const TranslateTransformOperation* fromOp = static_cast<const TranslateTrans
formOperation*>(from); |
| 37 Length fromX = fromOp ? fromOp->m_x : zeroLength; | 37 Length fromX = fromOp ? fromOp->m_x : zeroLength; |
| 38 Length fromY = fromOp ? fromOp->m_y : zeroLength; | 38 Length fromY = fromOp ? fromOp->m_y : zeroLength; |
| 39 double fromZ = fromOp ? fromOp->m_z : 0; | 39 double fromZ = fromOp ? fromOp->m_z : 0; |
| 40 return TranslateTransformOperation::create(m_x.blend(fromX, progress, ValueR
angeAll), m_y.blend(fromY, progress, ValueRangeAll), WebCore::blend(fromZ, m_z,
progress), m_type); | 40 return TranslateTransformOperation::create(m_x.blend(fromX, progress, ValueR
angeAll), m_y.blend(fromY, progress, ValueRangeAll), WebCore::blend(fromZ, m_z,
progress), m_type); |
| 41 } | 41 } |
| 42 | 42 |
| 43 bool TranslateTransformOperation::canBlendWith(const TransformOperation& other)
const |
| 44 { |
| 45 return other.type() == Translate |
| 46 || other.type() == TranslateX |
| 47 || other.type() == TranslateY |
| 48 || other.type() == TranslateZ |
| 49 || other.type() == Translate3D; |
| 50 } |
| 51 |
| 43 } // namespace WebCore | 52 } // namespace WebCore |
| OLD | NEW |