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

Unified Diff: Source/core/page/animation/CSSPropertyAnimation.cpp

Issue 14556022: Simplify animation testing API (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/page/animation/CSSPropertyAnimation.h ('k') | Source/core/page/animation/CompositeAnimation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/animation/CSSPropertyAnimation.cpp
diff --git a/Source/core/page/animation/CSSPropertyAnimation.cpp b/Source/core/page/animation/CSSPropertyAnimation.cpp
index 637b8de45d9929f69e2dc6b39612b224adbe63e5..84e7a2850eb7d2b5d7114b72b10fc980ab222a81 100644
--- a/Source/core/page/animation/CSSPropertyAnimation.cpp
+++ b/Source/core/page/animation/CSSPropertyAnimation.cpp
@@ -1208,27 +1208,6 @@ void CSSPropertyAnimation::ensurePropertyMap()
addShorthandProperties();
}
-static bool gatherEnclosingShorthandProperties(CSSPropertyID property, AnimationPropertyWrapperBase* wrapper, HashSet<CSSPropertyID>& propertySet)
-{
- if (!wrapper->isShorthandWrapper())
- return false;
-
- ShorthandPropertyWrapper* shorthandWrapper = static_cast<ShorthandPropertyWrapper*>(wrapper);
-
- bool contained = false;
- for (size_t i = 0; i < shorthandWrapper->propertyWrappers().size(); ++i) {
- AnimationPropertyWrapperBase* currWrapper = shorthandWrapper->propertyWrappers()[i];
-
- if (gatherEnclosingShorthandProperties(property, currWrapper, propertySet) || currWrapper->property() == property)
- contained = true;
- }
-
- if (contained)
- propertySet.add(wrapper->property());
-
- return contained;
-}
-
// Returns true if we need to start animation timers
bool CSSPropertyAnimation::blendProperties(const AnimationBase* anim, CSSPropertyID prop, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress)
{
@@ -1252,18 +1231,6 @@ bool CSSPropertyAnimation::animationOfPropertyIsAccelerated(CSSPropertyID prop)
return wrapper ? wrapper->animationIsAccelerated() : false;
}
-// Note: this is inefficient. It's only called from pauseTransitionAtTime().
-HashSet<CSSPropertyID> CSSPropertyAnimation::animatableShorthandsAffectingProperty(CSSPropertyID property)
-{
- ensurePropertyMap();
-
- HashSet<CSSPropertyID> foundProperties;
- for (int i = 0; i < getNumProperties(); ++i)
- gatherEnclosingShorthandProperties(property, (*gPropertyWrappers)[i], foundProperties);
-
- return foundProperties;
-}
-
bool CSSPropertyAnimation::propertiesEqual(CSSPropertyID prop, const RenderStyle* a, const RenderStyle* b)
{
ensurePropertyMap();
« no previous file with comments | « Source/core/page/animation/CSSPropertyAnimation.h ('k') | Source/core/page/animation/CompositeAnimation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698