Index: Source/core/css/resolver/StyleResolver.h |
diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h |
index 3c5a8b3927b51331ee1207faf1209d702d63b299..81afe1fed4ce0afa1ff694a93cdefb977fc97367 100644 |
--- a/Source/core/css/resolver/StyleResolver.h |
+++ b/Source/core/css/resolver/StyleResolver.h |
@@ -42,6 +42,7 @@ |
namespace WebCore { |
+class CSSAnimationUpdate; |
class CSSFontSelector; |
class CSSRuleList; |
class CSSSelector; |
@@ -222,7 +223,7 @@ public: |
// FIXME: Used by SharingStyleFinder, but should be removed. |
bool styleSharingCandidateMatchesRuleSet(const ElementResolveContext&, RenderStyle*, RuleSet*); |
- const StyleRuleKeyframes* matchScopedKeyframesRule(Element*, const StringImpl* animationName); |
+ const StyleRuleKeyframes* matchScopedKeyframesRule(const Element*, const StringImpl* animationName); |
PassRefPtr<RenderStyle> styleForKeyframe(Element*, const RenderStyle*, const StyleKeyframe*, KeyframeValue&); |
// These methods will give back the set of rules that matched for a given element (or a pseudo-element). |
@@ -288,6 +289,7 @@ private: |
bool fastRejectSelector(const RuleData&) const; |
+ PassOwnPtr<CSSAnimationUpdate> calculateCSSAnimationUpdate(StyleResolverState&); |
void applyMatchedProperties(StyleResolverState&, const MatchResult&); |
enum StyleApplicationPass { |
@@ -303,7 +305,7 @@ private: |
template <StyleApplicationPass pass> |
void applyProperties(StyleResolverState&, const StylePropertySet* properties, StyleRule*, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone); |
template <StyleApplicationPass pass> |
- void applyAnimatedProperties(StyleResolverState&, const Element*, const DocumentTimeline*); |
+ void applyAnimatedProperties(StyleResolverState&, const Element*, const DocumentTimeline*, const CSSAnimationUpdate*); |
void resolveVariables(StyleResolverState&, CSSPropertyID, CSSValue*, Vector<std::pair<CSSPropertyID, String> >& knownExpressions); |
void matchPageRules(MatchResult&, RuleSet*, bool isLeftPage, bool isFirstPage, const String& pageName); |
void matchPageRulesForList(Vector<StyleRulePage*>& matchedRules, const Vector<StyleRulePage*>&, bool isLeftPage, bool isFirstPage, const String& pageName); |