| Index: third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
|
| diff --git a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
|
| index 4a0b73756cebe5719c9df47e1d3f24ff49437a5e..905bb54365a45b8ab444d889af1a0d351816ce81 100644
|
| --- a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
|
| +++ b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
|
| @@ -222,7 +222,7 @@ void SVGSMILElement::buildPendingResource()
|
| {
|
| clearResourceAndEventBaseReferences();
|
|
|
| - if (!inShadowIncludingDocument()) {
|
| + if (!isConnected()) {
|
| // Reset the target element if we are no longer in the document.
|
| setTargetElement(nullptr);
|
| return;
|
| @@ -237,7 +237,7 @@ void SVGSMILElement::buildPendingResource()
|
| target = SVGURIReference::targetElementFromIRIString(href, treeScope(), &id);
|
| SVGElement* svgTarget = target && target->isSVGElement() ? toSVGElement(target) : nullptr;
|
|
|
| - if (svgTarget && !svgTarget->inShadowIncludingDocument())
|
| + if (svgTarget && !svgTarget->isConnected())
|
| svgTarget = nullptr;
|
|
|
| if (svgTarget != targetElement())
|
| @@ -313,7 +313,7 @@ Node::InsertionNotificationRequest SVGSMILElement::insertedInto(ContainerNode* r
|
| {
|
| SVGElement::insertedInto(rootParent);
|
|
|
| - if (!rootParent->inShadowIncludingDocument())
|
| + if (!rootParent->isConnected())
|
| return InsertionDone;
|
|
|
| Deprecation::countDeprecation(document(), UseCounter::SVGSMILElementInDocument);
|
| @@ -344,7 +344,7 @@ Node::InsertionNotificationRequest SVGSMILElement::insertedInto(ContainerNode* r
|
|
|
| void SVGSMILElement::removedFrom(ContainerNode* rootParent)
|
| {
|
| - if (rootParent->inShadowIncludingDocument()) {
|
| + if (rootParent->isConnected()) {
|
| clearResourceAndEventBaseReferences();
|
| clearConditions();
|
| setTargetElement(nullptr);
|
| @@ -517,7 +517,7 @@ void SVGSMILElement::parseAttribute(const QualifiedName& name, const AtomicStrin
|
| parseBeginOrEnd(fastGetAttribute(SVGNames::endAttr), End);
|
| }
|
| parseBeginOrEnd(value.getString(), Begin);
|
| - if (inShadowIncludingDocument())
|
| + if (isConnected())
|
| connectSyncBaseConditions();
|
| } else if (name == SVGNames::endAttr) {
|
| if (!m_conditions.isEmpty()) {
|
| @@ -525,7 +525,7 @@ void SVGSMILElement::parseAttribute(const QualifiedName& name, const AtomicStrin
|
| parseBeginOrEnd(fastGetAttribute(SVGNames::beginAttr), Begin);
|
| }
|
| parseBeginOrEnd(value.getString(), End);
|
| - if (inShadowIncludingDocument())
|
| + if (isConnected())
|
| connectSyncBaseConditions();
|
| } else if (name == SVGNames::onbeginAttr) {
|
| setAttributeEventListener(EventTypeNames::beginEvent, createAttributeEventListener(this, name, value, eventParameterName()));
|
| @@ -559,7 +559,7 @@ void SVGSMILElement::svgAttributeChanged(const QualifiedName& attrName)
|
| if (m_targetElement)
|
| clearAnimatedType();
|
| } else if (attrName == SVGNames::beginAttr || attrName == SVGNames::endAttr) {
|
| - if (inShadowIncludingDocument()) {
|
| + if (isConnected()) {
|
| connectEventBaseConditions();
|
| if (attrName == SVGNames::beginAttr)
|
| beginListChanged(elapsed());
|
|
|