OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> | 2 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> |
3 * Copyright (C) 2007 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2007 Rob Buis <buis@kde.org> |
4 * Copyright (C) 2008 Apple Inc. All rights reserved. | 4 * Copyright (C) 2008 Apple Inc. All rights reserved. |
5 * | 5 * |
6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 return parsePointInternal<UChar>(string, point); | 165 return parsePointInternal<UChar>(string, point); |
166 } | 166 } |
167 | 167 |
168 void SVGAnimateMotionElement::resetAnimatedType() | 168 void SVGAnimateMotionElement::resetAnimatedType() |
169 { | 169 { |
170 if (!hasValidAttributeType()) | 170 if (!hasValidAttributeType()) |
171 return; | 171 return; |
172 SVGElement* targetElement = this->targetElement(); | 172 SVGElement* targetElement = this->targetElement(); |
173 if (!targetElement) | 173 if (!targetElement) |
174 return; | 174 return; |
175 if (AffineTransform* transform = targetElement->supplementalTransform()) | 175 if (AffineTransform* transform = targetElement->animateMotionTransform()) |
176 transform->makeIdentity(); | 176 transform->makeIdentity(); |
177 } | 177 } |
178 | 178 |
179 void SVGAnimateMotionElement::clearAnimatedType(SVGElement* targetElement) | 179 void SVGAnimateMotionElement::clearAnimatedType(SVGElement* targetElement) |
180 { | 180 { |
181 if (!targetElement) | 181 if (!targetElement) |
182 return; | 182 return; |
183 | 183 |
184 AffineTransform* transform = targetElement->supplementalTransform(); | 184 AffineTransform* transform = targetElement->animateMotionTransform(); |
185 if (!transform) | 185 if (!transform) |
186 return; | 186 return; |
187 | 187 |
188 transform->makeIdentity(); | 188 transform->makeIdentity(); |
189 | 189 |
190 if (RenderObject* targetRenderer = targetElement->renderer()) { | 190 if (RenderObject* targetRenderer = targetElement->renderer()) { |
191 targetRenderer->setNeedsTransformUpdate(); | 191 targetRenderer->setNeedsTransformUpdate(); |
192 RenderSVGResource::markForLayoutAndParentResourceInvalidation(targetRend
erer); | 192 RenderSVGResource::markForLayoutAndParentResourceInvalidation(targetRend
erer); |
193 } | 193 } |
194 } | 194 } |
(...skipping 23 matching lines...) Expand all Loading... |
218 parsePoint(byString, byPoint); | 218 parsePoint(byString, byPoint); |
219 m_toPoint = FloatPoint(m_fromPoint.x() + byPoint.x(), m_fromPoint.y() + byPo
int.y()); | 219 m_toPoint = FloatPoint(m_fromPoint.x() + byPoint.x(), m_fromPoint.y() + byPo
int.y()); |
220 return true; | 220 return true; |
221 } | 221 } |
222 | 222 |
223 void SVGAnimateMotionElement::calculateAnimatedValue(float percentage, unsigned
repeatCount, SVGSMILElement*) | 223 void SVGAnimateMotionElement::calculateAnimatedValue(float percentage, unsigned
repeatCount, SVGSMILElement*) |
224 { | 224 { |
225 SVGElement* targetElement = this->targetElement(); | 225 SVGElement* targetElement = this->targetElement(); |
226 if (!targetElement) | 226 if (!targetElement) |
227 return; | 227 return; |
228 AffineTransform* transform = targetElement->supplementalTransform(); | 228 AffineTransform* transform = targetElement->animateMotionTransform(); |
229 if (!transform) | 229 if (!transform) |
230 return; | 230 return; |
231 | 231 |
232 if (RenderObject* targetRenderer = targetElement->renderer()) | 232 if (RenderObject* targetRenderer = targetElement->renderer()) |
233 targetRenderer->setNeedsTransformUpdate(); | 233 targetRenderer->setNeedsTransformUpdate(); |
234 | 234 |
235 if (!isAdditive()) | 235 if (!isAdditive()) |
236 transform->makeIdentity(); | 236 transform->makeIdentity(); |
237 | 237 |
238 if (animationMode() != PathAnimation) { | 238 if (animationMode() != PathAnimation) { |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
278 void SVGAnimateMotionElement::applyResultsToTarget() | 278 void SVGAnimateMotionElement::applyResultsToTarget() |
279 { | 279 { |
280 // We accumulate to the target element transform list so there is not much t
o do here. | 280 // We accumulate to the target element transform list so there is not much t
o do here. |
281 SVGElement* targetElement = this->targetElement(); | 281 SVGElement* targetElement = this->targetElement(); |
282 if (!targetElement) | 282 if (!targetElement) |
283 return; | 283 return; |
284 | 284 |
285 if (RenderObject* renderer = targetElement->renderer()) | 285 if (RenderObject* renderer = targetElement->renderer()) |
286 RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer); | 286 RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer); |
287 | 287 |
288 AffineTransform* t = targetElement->supplementalTransform(); | 288 AffineTransform* t = targetElement->animateMotionTransform(); |
289 if (!t) | 289 if (!t) |
290 return; | 290 return; |
291 | 291 |
292 // ...except in case where we have additional instances in <use> trees. | 292 // ...except in case where we have additional instances in <use> trees. |
293 const WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement> >& instances = ta
rgetElement->instancesForElement(); | 293 const WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement> >& instances = ta
rgetElement->instancesForElement(); |
294 const WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement> >::const_iterator
end = instances.end(); | 294 const WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement> >::const_iterator
end = instances.end(); |
295 for (WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement> >::const_iterator
it = instances.begin(); it != end; ++it) { | 295 for (WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement> >::const_iterator
it = instances.begin(); it != end; ++it) { |
296 SVGElement* shadowTreeElement = *it; | 296 SVGElement* shadowTreeElement = *it; |
297 ASSERT(shadowTreeElement); | 297 ASSERT(shadowTreeElement); |
298 AffineTransform* transform = shadowTreeElement->supplementalTransform(); | 298 AffineTransform* transform = shadowTreeElement->animateMotionTransform()
; |
299 if (!transform) | 299 if (!transform) |
300 continue; | 300 continue; |
301 transform->setMatrix(t->a(), t->b(), t->c(), t->d(), t->e(), t->f()); | 301 transform->setMatrix(t->a(), t->b(), t->c(), t->d(), t->e(), t->f()); |
302 if (RenderObject* renderer = shadowTreeElement->renderer()) { | 302 if (RenderObject* renderer = shadowTreeElement->renderer()) { |
303 renderer->setNeedsTransformUpdate(); | 303 renderer->setNeedsTransformUpdate(); |
304 RenderSVGResource::markForLayoutAndParentResourceInvalidation(render
er); | 304 RenderSVGResource::markForLayoutAndParentResourceInvalidation(render
er); |
305 } | 305 } |
306 } | 306 } |
307 } | 307 } |
308 | 308 |
(...skipping 11 matching lines...) Expand all Loading... |
320 | 320 |
321 void SVGAnimateMotionElement::updateAnimationMode() | 321 void SVGAnimateMotionElement::updateAnimationMode() |
322 { | 322 { |
323 if (!m_animationPath.isEmpty()) | 323 if (!m_animationPath.isEmpty()) |
324 setAnimationMode(PathAnimation); | 324 setAnimationMode(PathAnimation); |
325 else | 325 else |
326 SVGAnimationElement::updateAnimationMode(); | 326 SVGAnimationElement::updateAnimationMode(); |
327 } | 327 } |
328 | 328 |
329 } | 329 } |
OLD | NEW |