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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 if (!from.size() || !size() || from.operationsMatch(*this)) | 106 if (!from.size() || !size() || from.operationsMatch(*this)) |
107 return blendByMatchingOperations(from, progress); | 107 return blendByMatchingOperations(from, progress); |
108 | 108 |
109 return blendByUsingMatrixInterpolation(from, progress); | 109 return blendByUsingMatrixInterpolation(from, progress); |
110 } | 110 } |
111 | 111 |
112 TransformOperations TransformOperations::add(const TransformOperations& addend)
const | 112 TransformOperations TransformOperations::add(const TransformOperations& addend)
const |
113 { | 113 { |
114 TransformOperations result; | 114 TransformOperations result; |
115 result.m_operations = operations(); | 115 result.m_operations = operations(); |
116 result.m_operations.append(addend.operations()); | 116 result.m_operations.appendVector(addend.operations()); |
117 return result; | 117 return result; |
118 } | 118 } |
119 | 119 |
120 } // namespace WebCore | 120 } // namespace WebCore |
OLD | NEW |