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

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

Issue 174293005: Fix crash in which elementData() might be null. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix. Created 6 years, 10 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 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 const HashSet<SVGElementInstance*>::const_iterator end = instances.end(); 287 const HashSet<SVGElementInstance*>::const_iterator end = instances.end();
288 for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) { 288 for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) {
289 if (SVGElement* shadowTreeElement = (*it)->shadowTreeElement()) 289 if (SVGElement* shadowTreeElement = (*it)->shadowTreeElement())
290 removeCSSPropertyFromTarget(shadowTreeElement, id); 290 removeCSSPropertyFromTarget(shadowTreeElement, id);
291 } 291 }
292 } 292 }
293 293
294 static inline void notifyTargetAboutAnimValChange(SVGElement* targetElement, con st QualifiedName& attributeName) 294 static inline void notifyTargetAboutAnimValChange(SVGElement* targetElement, con st QualifiedName& attributeName)
295 { 295 {
296 ASSERT_WITH_SECURITY_IMPLICATION(!targetElement->m_deletionHasBegun); 296 ASSERT_WITH_SECURITY_IMPLICATION(!targetElement->m_deletionHasBegun);
297 targetElement->invalidateSVGAttributes();
297 targetElement->svgAttributeChanged(attributeName); 298 targetElement->svgAttributeChanged(attributeName);
298 } 299 }
299 300
300 static inline void notifyTargetAndInstancesAboutAnimValChange(SVGElement* target Element, const QualifiedName& attributeName) 301 static inline void notifyTargetAndInstancesAboutAnimValChange(SVGElement* target Element, const QualifiedName& attributeName)
301 { 302 {
302 ASSERT(targetElement); 303 ASSERT(targetElement);
303 if (attributeName == anyQName() || !targetElement->inDocument() || !targetEl ement->parentNode()) 304 if (attributeName == anyQName() || !targetElement->inDocument() || !targetEl ement->parentNode())
304 return; 305 return;
305 306
306 SVGElementInstance::InstanceUpdateBlocker blocker(targetElement); 307 SVGElementInstance::InstanceUpdateBlocker blocker(targetElement);
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 425
425 SVGAnimatedTypeAnimator* SVGAnimateElement::ensureAnimator() 426 SVGAnimatedTypeAnimator* SVGAnimateElement::ensureAnimator()
426 { 427 {
427 if (!m_animator) 428 if (!m_animator)
428 m_animator = SVGAnimatorFactory::create(this, targetElement(), m_animate dPropertyType); 429 m_animator = SVGAnimatorFactory::create(this, targetElement(), m_animate dPropertyType);
429 ASSERT(m_animatedPropertyType == m_animator->type()); 430 ASSERT(m_animatedPropertyType == m_animator->type());
430 return m_animator.get(); 431 return m_animator.get();
431 } 432 }
432 433
433 } 434 }
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