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

Unified Diff: Source/core/css/resolver/StyleResolver.h

Issue 863863004: Implemented additive animations for length (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed AnimationStackTest Created 5 years, 10 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: Source/core/css/resolver/StyleResolver.h
diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h
index edec7dc76e4ab20731bc5cde30fae28635ee0b80..6c0cfa9978d76a3fe498a188b6595ac905817f04 100644
--- a/Source/core/css/resolver/StyleResolver.h
+++ b/Source/core/css/resolver/StyleResolver.h
@@ -22,6 +22,7 @@
#ifndef StyleResolver_h
#define StyleResolver_h
+#include "core/animation/Interpolation.h"
#include "core/css/ElementRuleCollector.h"
#include "core/css/PseudoStyleRequest.h"
#include "core/css/RuleFeature.h"
@@ -53,7 +54,6 @@ class CSSValue;
class ContainerNode;
class Document;
class Element;
-class Interpolation;
class MediaQueryEvaluator;
class RuleData;
class ScopedStyleResolver;
@@ -234,7 +234,7 @@ private:
template <CSSPropertyPriority priority>
void applyProperties(StyleResolverState&, const StylePropertySet* properties, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone);
template <CSSPropertyPriority priority>
- void applyAnimatedProperties(StyleResolverState&, const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >&);
+ void applyAnimatedProperties(StyleResolverState&, const InterpolationPipelineMap&);
template <CSSPropertyPriority priority>
void applyAllProperty(StyleResolverState&, CSSValue*, bool inheritedOnly);

Powered by Google App Engine
This is Rietveld 408576698