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

Side by Side Diff: Source/WebCore/svg/animation/SVGSMILElement.cpp

Issue 7048008: Merge 86748 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 years, 7 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
« no previous file with comments | « LayoutTests/svg/animations/smil-element-not-removed-crash-expected.txt ('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) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 , m_cachedMin(invalidCachedTime) 134 , m_cachedMin(invalidCachedTime)
135 , m_cachedMax(invalidCachedTime) 135 , m_cachedMax(invalidCachedTime)
136 { 136 {
137 } 137 }
138 138
139 SVGSMILElement::~SVGSMILElement() 139 SVGSMILElement::~SVGSMILElement()
140 { 140 {
141 disconnectConditions(); 141 disconnectConditions();
142 if (m_timeContainer) 142 if (m_timeContainer)
143 m_timeContainer->unschedule(this); 143 m_timeContainer->unschedule(this);
144 if (m_targetElement)
145 document()->accessSVGExtensions()->removeAnimationElementFromTarget(this , m_targetElement);
144 } 146 }
145 147
146 static inline QualifiedName constructQualifiedName(const SVGElement* svgElement, const String& attributeName) 148 static inline QualifiedName constructQualifiedName(const SVGElement* svgElement, const String& attributeName)
147 { 149 {
148 ASSERT(svgElement); 150 ASSERT(svgElement);
149 if (attributeName.isEmpty()) 151 if (attributeName.isEmpty())
150 return anyQName(); 152 return anyQName();
151 if (!attributeName.contains(':')) 153 if (!attributeName.contains(':'))
152 return QualifiedName(nullAtom, attributeName, nullAtom); 154 return QualifiedName(nullAtom, attributeName, nullAtom);
153 155
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 } 991 }
990 992
991 void SVGSMILElement::beginByLinkActivation() 993 void SVGSMILElement::beginByLinkActivation()
992 { 994 {
993 addBeginTime(elapsed()); 995 addBeginTime(elapsed());
994 } 996 }
995 997
996 } 998 }
997 999
998 #endif 1000 #endif
OLDNEW
« no previous file with comments | « LayoutTests/svg/animations/smil-element-not-removed-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698