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

Unified Diff: Source/core/svg/SVGAnimateElement.cpp

Issue 266063002: Store SVGElement instead of SVGElementInstance for instancesForElement (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix nits Created 6 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
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/svg/SVGAnimateMotionElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGAnimateElement.cpp
diff --git a/Source/core/svg/SVGAnimateElement.cpp b/Source/core/svg/SVGAnimateElement.cpp
index 9c34ed776b821c858b066e23280e9868e4ccc031..6bbf187770ada10df75d24e8fed8173143402099 100644
--- a/Source/core/svg/SVGAnimateElement.cpp
+++ b/Source/core/svg/SVGAnimateElement.cpp
@@ -148,10 +148,10 @@ Vector<SVGElement*> findElementInstances(SVGElement* targetElement)
animatedElements.append(targetElement);
- const HashSet<SVGElementInstance*>& instances = targetElement->instancesForElement();
- const HashSet<SVGElementInstance*>::const_iterator end = instances.end();
- for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) {
- if (SVGElement* shadowTreeElement = (*it)->shadowTreeElement())
+ const HashSet<SVGElement*>& instances = targetElement->instancesForElement();
+ const HashSet<SVGElement*>::const_iterator end = instances.end();
+ for (HashSet<SVGElement*>::const_iterator it = instances.begin(); it != end; ++it) {
+ if (SVGElement* shadowTreeElement = *it)
animatedElements.append(shadowTreeElement);
}
@@ -231,10 +231,10 @@ static inline void applyCSSPropertyToTargetAndInstances(SVGElement* targetElemen
applyCSSPropertyToTarget(targetElement, id, valueAsString);
// If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
- const HashSet<SVGElementInstance*>& instances = targetElement->instancesForElement();
- const HashSet<SVGElementInstance*>::const_iterator end = instances.end();
- for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) {
- if (SVGElement* shadowTreeElement = (*it)->shadowTreeElement())
+ const HashSet<SVGElement*>& instances = targetElement->instancesForElement();
+ const HashSet<SVGElement*>::const_iterator end = instances.end();
+ for (HashSet<SVGElement*>::const_iterator it = instances.begin(); it != end; ++it) {
+ if (SVGElement* shadowTreeElement = *it)
applyCSSPropertyToTarget(shadowTreeElement, id, valueAsString);
}
}
@@ -251,10 +251,10 @@ static inline void removeCSSPropertyFromTargetAndInstances(SVGElement* targetEle
removeCSSPropertyFromTarget(targetElement, id);
// If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
- const HashSet<SVGElementInstance*>& instances = targetElement->instancesForElement();
- const HashSet<SVGElementInstance*>::const_iterator end = instances.end();
- for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) {
- if (SVGElement* shadowTreeElement = (*it)->shadowTreeElement())
+ const HashSet<SVGElement*>& instances = targetElement->instancesForElement();
+ const HashSet<SVGElement*>::const_iterator end = instances.end();
+ for (HashSet<SVGElement*>::const_iterator it = instances.begin(); it != end; ++it) {
+ if (SVGElement* shadowTreeElement = *it)
removeCSSPropertyFromTarget(shadowTreeElement, id);
}
}
@@ -276,10 +276,10 @@ static inline void notifyTargetAndInstancesAboutAnimValChange(SVGElement* target
notifyTargetAboutAnimValChange(targetElement, attributeName);
// If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
- const HashSet<SVGElementInstance*>& instances = targetElement->instancesForElement();
- const HashSet<SVGElementInstance*>::const_iterator end = instances.end();
- for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) {
- if (SVGElement* shadowTreeElement = (*it)->shadowTreeElement())
+ const HashSet<SVGElement*>& instances = targetElement->instancesForElement();
+ const HashSet<SVGElement*>::const_iterator end = instances.end();
+ for (HashSet<SVGElement*>::const_iterator it = instances.begin(); it != end; ++it) {
+ if (SVGElement* shadowTreeElement = *it)
notifyTargetAboutAnimValChange(shadowTreeElement, attributeName);
}
}
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/svg/SVGAnimateMotionElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698