| 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, |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 13 * Library General Public License for more details. | 13 * Library General Public License for more details. |
| 14 * | 14 * |
| 15 * You should have received a copy of the GNU Library General Public License | 15 * You should have received a copy of the GNU Library General Public License |
| 16 * along with this library; see the file COPYING.LIB. If not, write to | 16 * along with this library; see the file COPYING.LIB. If not, write to |
| 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 18 * Boston, MA 02110-1301, USA. | 18 * Boston, MA 02110-1301, USA. |
| 19 * | 19 * |
| 20 */ | 20 */ |
| 21 | 21 |
| 22 #include "config.h" | 22 #include "config.h" |
| 23 #include "core/platform/FloatConversion.h" | |
| 24 #include "core/platform/graphics/transforms/TranslateTransformOperation.h" | 23 #include "core/platform/graphics/transforms/TranslateTransformOperation.h" |
| 25 | 24 |
| 26 namespace WebCore { | 25 namespace WebCore { |
| 27 | 26 |
| 28 PassRefPtr<TransformOperation> TranslateTransformOperation::blend(const Transfor
mOperation* from, double progress, bool blendToIdentity) | 27 PassRefPtr<TransformOperation> TranslateTransformOperation::blend(const Transfor
mOperation* from, double progress, bool blendToIdentity) |
| 29 { | 28 { |
| 30 if (from && !from->isSameType(*this)) | 29 if (from && !from->isSameType(*this)) |
| 31 return this; | 30 return this; |
| 32 | 31 |
| 33 if (blendToIdentity) | 32 if (blendToIdentity) |
| 34 return TranslateTransformOperation::create(Length(m_x.type()).blend(m_x,
progress), | 33 return TranslateTransformOperation::create(Length(m_x.type()).blend(m_x,
progress), |
| 35 Length(m_y.type()).blend(m_y,
progress), | 34 Length(m_y.type()).blend(m_y,
progress), |
| 36 Length(m_z.type()).blend(m_z,
progress), m_type); | 35 Length(m_z.type()).blend(m_z,
progress), m_type); |
| 37 | 36 |
| 38 const TranslateTransformOperation* fromOp = static_cast<const TranslateTrans
formOperation*>(from); | 37 const TranslateTransformOperation* fromOp = static_cast<const TranslateTrans
formOperation*>(from); |
| 39 Length fromX = fromOp ? fromOp->m_x : Length(m_x.type()); | 38 Length fromX = fromOp ? fromOp->m_x : Length(m_x.type()); |
| 40 Length fromY = fromOp ? fromOp->m_y : Length(m_y.type()); | 39 Length fromY = fromOp ? fromOp->m_y : Length(m_y.type()); |
| 41 Length fromZ = fromOp ? fromOp->m_z : Length(m_z.type()); | 40 Length fromZ = fromOp ? fromOp->m_z : Length(m_z.type()); |
| 42 return TranslateTransformOperation::create(m_x.blend(fromX, progress), m_y.b
lend(fromY, progress), m_z.blend(fromZ, progress), m_type); | 41 return TranslateTransformOperation::create(m_x.blend(fromX, progress), m_y.b
lend(fromY, progress), m_z.blend(fromZ, progress), m_type); |
| 43 } | 42 } |
| 44 | 43 |
| 45 } // namespace WebCore | 44 } // namespace WebCore |
| OLD | NEW |