OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde
.org> | 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann |
| 3 * <zimmermann@kde.org> |
3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> | 4 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> |
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> | 5 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> |
5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
6 * | 7 * |
7 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 11 * version 2 of the License, or (at your option) any later version. |
11 * | 12 * |
12 * This library is distributed in the hope that it will be useful, | 13 * This library is distributed in the hope that it will be useful, |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 | 132 |
132 const SVGPath& from = toSVGPath(*fromValue); | 133 const SVGPath& from = toSVGPath(*fromValue); |
133 const SVGPathByteStream* fromStream = &from.byteStream(); | 134 const SVGPathByteStream* fromStream = &from.byteStream(); |
134 | 135 |
135 std::unique_ptr<SVGPathByteStream> copy; | 136 std::unique_ptr<SVGPathByteStream> copy; |
136 if (isToAnimation) { | 137 if (isToAnimation) { |
137 copy = byteStream().clone(); | 138 copy = byteStream().clone(); |
138 fromStream = copy.get(); | 139 fromStream = copy.get(); |
139 } | 140 } |
140 | 141 |
141 // If the 'from' value is given and it's length doesn't match the 'to' value l
ist length, fallback to a discrete animation. | 142 // If the 'from' value is given and it's length doesn't match the 'to' value |
| 143 // list length, fallback to a discrete animation. |
142 if (fromStream->size() != toStream.size() && fromStream->size()) { | 144 if (fromStream->size() != toStream.size() && fromStream->size()) { |
143 if (percentage < 0.5) { | 145 if (percentage < 0.5) { |
144 if (!isToAnimation) { | 146 if (!isToAnimation) { |
145 m_pathValue = from.pathValue(); | 147 m_pathValue = from.pathValue(); |
146 return; | 148 return; |
147 } | 149 } |
148 } else { | 150 } else { |
149 m_pathValue = to.pathValue(); | 151 m_pathValue = to.pathValue(); |
150 return; | 152 return; |
151 } | 153 } |
(...skipping 20 matching lines...) Expand all Loading... |
172 // FIXME: Support paced animations. | 174 // FIXME: Support paced animations. |
173 return -1; | 175 return -1; |
174 } | 176 } |
175 | 177 |
176 DEFINE_TRACE(SVGPath) { | 178 DEFINE_TRACE(SVGPath) { |
177 visitor->trace(m_pathValue); | 179 visitor->trace(m_pathValue); |
178 SVGPropertyBase::trace(visitor); | 180 SVGPropertyBase::trace(visitor); |
179 } | 181 } |
180 | 182 |
181 } // namespace blink | 183 } // namespace blink |
OLD | NEW |