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

Unified Diff: third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp

Issue 1858163002: Rename inDocument() to inShadowIncludingDocument() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
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 f8e05d5da8b273dd7d848abe1df7cf07c50b053b..f3d597737b160c6fb875e586a782974e9ef00383 100644
--- a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
+++ b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
@@ -232,7 +232,7 @@ void SVGSMILElement::buildPendingResource()
{
clearResourceAndEventBaseReferences();
- if (!inDocument()) {
+ if (!inShadowIncludingDocument()) {
// Reset the target element if we are no longer in the document.
setTargetElement(nullptr);
return;
@@ -247,7 +247,7 @@ void SVGSMILElement::buildPendingResource()
target = SVGURIReference::targetElementFromIRIString(href, treeScope(), &id);
SVGElement* svgTarget = target && target->isSVGElement() ? toSVGElement(target) : nullptr;
- if (svgTarget && !svgTarget->inDocument())
+ if (svgTarget && !svgTarget->inShadowIncludingDocument())
svgTarget = nullptr;
if (svgTarget != targetElement())
@@ -323,7 +323,7 @@ Node::InsertionNotificationRequest SVGSMILElement::insertedInto(ContainerNode* r
{
SVGElement::insertedInto(rootParent);
- if (!rootParent->inDocument())
+ if (!rootParent->inShadowIncludingDocument())
return InsertionDone;
Deprecation::countDeprecation(document(), UseCounter::SVGSMILElementInDocument);
@@ -354,7 +354,7 @@ Node::InsertionNotificationRequest SVGSMILElement::insertedInto(ContainerNode* r
void SVGSMILElement::removedFrom(ContainerNode* rootParent)
{
- if (rootParent->inDocument()) {
+ if (rootParent->inShadowIncludingDocument()) {
clearResourceAndEventBaseReferences();
clearConditions();
setTargetElement(nullptr);
@@ -527,7 +527,7 @@ void SVGSMILElement::parseAttribute(const QualifiedName& name, const AtomicStrin
parseBeginOrEnd(fastGetAttribute(SVGNames::endAttr), End);
}
parseBeginOrEnd(value.getString(), Begin);
- if (inDocument())
+ if (inShadowIncludingDocument())
connectSyncBaseConditions();
} else if (name == SVGNames::endAttr) {
if (!m_conditions.isEmpty()) {
@@ -535,7 +535,7 @@ void SVGSMILElement::parseAttribute(const QualifiedName& name, const AtomicStrin
parseBeginOrEnd(fastGetAttribute(SVGNames::beginAttr), Begin);
}
parseBeginOrEnd(value.getString(), End);
- if (inDocument())
+ if (inShadowIncludingDocument())
connectSyncBaseConditions();
} else if (name == SVGNames::onbeginAttr) {
setAttributeEventListener(EventTypeNames::beginEvent, createAttributeEventListener(this, name, value, eventParameterName()));
@@ -569,7 +569,7 @@ void SVGSMILElement::svgAttributeChanged(const QualifiedName& attrName)
if (m_targetElement)
clearAnimatedType();
} else if (attrName == SVGNames::beginAttr || attrName == SVGNames::endAttr) {
- if (inDocument()) {
+ if (inShadowIncludingDocument()) {
connectEventBaseConditions();
if (attrName == SVGNames::beginAttr)
beginListChanged(elapsed());

Powered by Google App Engine
This is Rietveld 408576698