Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(344)

Side by Side Diff: Source/core/svg/SVGAnimateElement.cpp

Issue 182903004: Merge 167817 "Fix crash in which elementData() might be null." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1847/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Element.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
4 * Copyright (C) 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 2008 Apple Inc. All rights reserved.
5 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 const HashSet<SVGElementInstance*>::const_iterator end = instances.end(); 294 const HashSet<SVGElementInstance*>::const_iterator end = instances.end();
295 for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) { 295 for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) {
296 if (SVGElement* shadowTreeElement = (*it)->shadowTreeElement()) 296 if (SVGElement* shadowTreeElement = (*it)->shadowTreeElement())
297 removeCSSPropertyFromTarget(shadowTreeElement, id); 297 removeCSSPropertyFromTarget(shadowTreeElement, id);
298 } 298 }
299 } 299 }
300 300
301 static inline void notifyTargetAboutAnimValChange(SVGElement* targetElement, con st QualifiedName& attributeName) 301 static inline void notifyTargetAboutAnimValChange(SVGElement* targetElement, con st QualifiedName& attributeName)
302 { 302 {
303 ASSERT_WITH_SECURITY_IMPLICATION(!targetElement->m_deletionHasBegun); 303 ASSERT_WITH_SECURITY_IMPLICATION(!targetElement->m_deletionHasBegun);
304 targetElement->invalidateSVGAttributes();
304 targetElement->svgAttributeChanged(attributeName); 305 targetElement->svgAttributeChanged(attributeName);
305 } 306 }
306 307
307 static inline void notifyTargetAndInstancesAboutAnimValChange(SVGElement* target Element, const QualifiedName& attributeName) 308 static inline void notifyTargetAndInstancesAboutAnimValChange(SVGElement* target Element, const QualifiedName& attributeName)
308 { 309 {
309 ASSERT(targetElement); 310 ASSERT(targetElement);
310 if (attributeName == anyQName() || !targetElement->inDocument() || !targetEl ement->parentNode()) 311 if (attributeName == anyQName() || !targetElement->inDocument() || !targetEl ement->parentNode())
311 return; 312 return;
312 313
313 SVGElementInstance::InstanceUpdateBlocker blocker(targetElement); 314 SVGElementInstance::InstanceUpdateBlocker blocker(targetElement);
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 432
432 SVGAnimatedTypeAnimator* SVGAnimateElement::ensureAnimator() 433 SVGAnimatedTypeAnimator* SVGAnimateElement::ensureAnimator()
433 { 434 {
434 if (!m_animator) 435 if (!m_animator)
435 m_animator = SVGAnimatorFactory::create(this, targetElement(), m_animate dPropertyType); 436 m_animator = SVGAnimatorFactory::create(this, targetElement(), m_animate dPropertyType);
436 ASSERT(m_animatedPropertyType == m_animator->type()); 437 ASSERT(m_animatedPropertyType == m_animator->type());
437 return m_animator.get(); 438 return m_animator.get();
438 } 439 }
439 440
440 } 441 }
OLDNEW
« no previous file with comments | « Source/core/dom/Element.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698