Chromium Code Reviews| Index: Source/core/svg/animation/SVGSMILElement.cpp |
| diff --git a/Source/core/svg/animation/SVGSMILElement.cpp b/Source/core/svg/animation/SVGSMILElement.cpp |
| index 3215869eab6bbfb2601a13eb45d07a6c0d31dc03..00db35def9def2f2f16902a6be8ae5524e04799e 100644 |
| --- a/Source/core/svg/animation/SVGSMILElement.cpp |
| +++ b/Source/core/svg/animation/SVGSMILElement.cpp |
| @@ -169,7 +169,7 @@ SVGSMILElement::Condition::Condition(Type type, BeginOrEnd beginOrEnd, const Str |
| SVGSMILElement::SVGSMILElement(const QualifiedName& tagName, Document& doc) |
| : SVGElement(tagName, doc) |
| , m_attributeName(anyQName()) |
| - , m_targetElement(0) |
| + , m_targetElement(nullptr) |
| , m_syncBaseConditionsConnected(false) |
| , m_hasEndEventConditions(false) |
| , m_isWaitingForFirstInterval(true) |
| @@ -199,9 +199,11 @@ SVGSMILElement::~SVGSMILElement() |
| smilBeginEventSender().cancelEvent(this); |
| smilRepeatEventSender().cancelEvent(this); |
| smilRepeatNEventSender().cancelEvent(this); |
| +#if !ENABLE(OILPAN) |
| clearConditions(); |
| if (m_timeContainer && m_targetElement && hasValidAttributeName()) |
| m_timeContainer->unschedule(this, m_targetElement, m_attributeName); |
|
haraken
2014/05/06 15:59:42
It's not clear to me if we can remove this in oilp
kouhei (in TOK)
2014/05/07 01:43:13
I think we can move these to removedFrom.
Mads Ager (chromium)
2014/05/07 12:13:16
This is already in removedFrom which is why I beli
|
| +#endif |
| } |
| void SVGSMILElement::clearResourceAndEventBaseReferences() |
| @@ -1330,4 +1332,10 @@ void SVGSMILElement::dispatchPendingEvent(SMILEventSender* eventSender) |
| } |
| } |
| +void SVGSMILElement::trace(Visitor* visitor) |
| +{ |
| + visitor->trace(m_targetElement); |
| + SVGElement::trace(visitor); |
| +} |
| + |
| } |