Source/core/css/resolver/StyleResolver.h - Issue 26382004: Web Animations CSS: Implement CSS Transitions backed on Web Animations model

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 26382004: Web Animations CSS: Implement CSS Transitions backed on Web Animations model (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master

Patch Set: fix logic for elapsedTime in event Created 7 years, 2 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

« Source/core/css/resolver/StyleAdjuster.cpp ('K') | « Source/core/css/resolver/StyleAdjuster.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | Source/core/css/resolver/StyleResolver.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/resolver/StyleResolver.h

diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h

index 1b3156d62c6d1d8a309d777d9558899fc35fd59f..7330c5c12b7a4e921842b5b1fec169f942b85973 100644

--- a/Source/core/css/resolver/StyleResolver.h

+++ b/Source/core/css/resolver/StyleResolver.h

@@ -191,9 +191,6 @@ public:

RuleMatchingBehavior = MatchAllRules, RenderRegion* regionForStyling = 0);

// FIXME: The following logic related to animations and keyframes should be factored out of StyleResolver

- // The body of calculateCSSAnimationUpdate can move to CSSAnimations.cpp and take just const element, const style,

- // and const ScopedStyleTree

- void calculateCSSAnimationUpdate(StyleResolverState&);

void resolveKeyframes(Element*, const RenderStyle*, const AtomicString& animationName, TimingFunction* defaultTimingFunction, Vector<std::pair<KeyframeAnimationEffect::KeyframeVector, RefPtr<TimingFunction> > >&);

void keyframeStylesForAnimation(Element*, const RenderStyle*, KeyframeList&);

const StyleRuleKeyframes* matchScopedKeyframesRule(const Element*, const StringImpl* animationName);

@@ -317,6 +314,7 @@ private:

void applyProperties(StyleResolverState&, const StylePropertySet* properties, StyleRule*, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone);

template <StyleApplicationPass pass>

bool applyAnimatedProperties(StyleResolverState&, const DocumentTimeline*);

+ void applyTransitionedProperties(StyleResolverState&);

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);

void collectViewportRules();