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 10 matching lines...) Expand all Loading... |
21 | 21 |
22 #include "config.h" | 22 #include "config.h" |
23 #include "core/platform/graphics/transforms/MatrixTransformOperation.h" | 23 #include "core/platform/graphics/transforms/MatrixTransformOperation.h" |
24 | 24 |
25 #include <algorithm> | 25 #include <algorithm> |
26 | 26 |
27 using namespace std; | 27 using namespace std; |
28 | 28 |
29 namespace WebCore { | 29 namespace WebCore { |
30 | 30 |
31 PassRefPtr<TransformOperation> MatrixTransformOperation::blend(const TransformOp
eration* from, double progress, bool blendToIdentity) | 31 PassRefPtr<TransformOperation> MatrixTransformOperation::blend(const TransformOp
eration* from, double progress, bool blendToIdentity, RenderView* renderView) |
32 { | 32 { |
33 if (from && !from->isSameType(*this)) | 33 if (from && !from->isSameType(*this)) |
34 return this; | 34 return this; |
35 | 35 |
36 // convert the TransformOperations into matrices | 36 // convert the TransformOperations into matrices |
37 FloatSize size; | 37 FloatSize size; |
38 TransformationMatrix fromT; | 38 TransformationMatrix fromT; |
39 TransformationMatrix toT(m_a, m_b, m_c, m_d, m_e, m_f); | 39 TransformationMatrix toT(m_a, m_b, m_c, m_d, m_e, m_f); |
40 if (from) { | 40 if (from) { |
41 const MatrixTransformOperation* m = static_cast<const MatrixTransformOpe
ration*>(from); | 41 const MatrixTransformOperation* m = static_cast<const MatrixTransformOpe
ration*>(from); |
42 fromT.setMatrix(m->m_a, m->m_b, m->m_c, m->m_d, m->m_e, m->m_f); | 42 fromT.setMatrix(m->m_a, m->m_b, m->m_c, m->m_d, m->m_e, m->m_f); |
43 } | 43 } |
44 | 44 |
45 if (blendToIdentity) | 45 if (blendToIdentity) |
46 std::swap(fromT, toT); | 46 std::swap(fromT, toT); |
47 | 47 |
48 toT.blend(fromT, progress); | 48 toT.blend(fromT, progress); |
49 return MatrixTransformOperation::create(toT.a(), toT.b(), toT.c(), toT.d(),
toT.e(), toT.f()); | 49 return MatrixTransformOperation::create(toT.a(), toT.b(), toT.c(), toT.d(),
toT.e(), toT.f()); |
50 } | 50 } |
51 | 51 |
52 } // namespace WebCore | 52 } // namespace WebCore |
OLD | NEW |