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/graphics/transforms/ScaleTransformOperation.h" | 23 #include "core/platform/graphics/transforms/ScaleTransformOperation.h" |
24 | 24 |
25 #include "core/platform/animation/AnimationUtilities.h" | 25 #include "core/platform/animation/AnimationUtilities.h" |
26 | 26 |
27 namespace WebCore { | 27 namespace WebCore { |
28 | 28 |
29 PassRefPtr<TransformOperation> ScaleTransformOperation::blend(const TransformOpe
ration* from, double progress, bool blendToIdentity) | 29 PassRefPtr<TransformOperation> ScaleTransformOperation::blend(const TransformOpe
ration* from, double progress, bool blendToIdentity, RenderView* renderView) |
30 { | 30 { |
31 if (from && !from->isSameType(*this)) | 31 if (from && !from->isSameType(*this)) |
32 return this; | 32 return this; |
33 | 33 |
34 if (blendToIdentity) | 34 if (blendToIdentity) |
35 return ScaleTransformOperation::create(WebCore::blend(m_x, 1.0, progress
), | 35 return ScaleTransformOperation::create(WebCore::blend(m_x, 1.0, progress
), |
36 WebCore::blend(m_y, 1.0, progress
), | 36 WebCore::blend(m_y, 1.0, progress
), |
37 WebCore::blend(m_z, 1.0, progress
), m_type); | 37 WebCore::blend(m_z, 1.0, progress
), m_type); |
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 } // namespace WebCore | 48 } // namespace WebCore |
OLD | NEW |