Source/core/animation/TimedItem.cpp - Issue 46043014: Web Animations CSS: Unfreeze AnimationClock if sampling timelines does not trigger style recalc

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/animation/TimedItem.cpp

Issue 46043014: Web Animations CSS: Unfreeze AnimationClock if sampling timelines does not trigger style recalc (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Reinstate assert Created 7 years, 1 month 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/animation/TimedItem.cpp

diff --git a/Source/core/animation/TimedItem.cpp b/Source/core/animation/TimedItem.cpp

index 4be5749e786e97d1ef79ce4a091f84a36e1a64b0..5c630d5561b19e64bee338e320b67555e0aa905a 100644

--- a/Source/core/animation/TimedItem.cpp

+++ b/Source/core/animation/TimedItem.cpp

@@ -46,7 +46,7 @@ TimedItem::TimedItem(const Timing& timing, PassOwnPtr<EventDelegate> eventDelega

timing.assertValid();

}

-void TimedItem::updateInheritedTime(double inheritedTime) const

+bool TimedItem::updateInheritedTime(double inheritedTime) const

{

const double localTime = inheritedTime - m_startTime;

const double iterationDuration = m_specified.hasIterationDuration

@@ -106,9 +106,10 @@ void TimedItem::updateInheritedTime(double inheritedTime) const

m_isFirstSample = false;

// FIXME: This probably shouldn't be recursive.

- updateChildrenAndEffects();

+ bool didTriggerStyleRecalc = updateChildrenAndEffects();

m_calculated.timeToEffectChange = calculateTimeToEffectChange(localTime, m_startTime + m_specified.startDelay, m_calculated.phase);

+ return didTriggerStyleRecalc;

}

} // namespace WebCore

« no previous file with comments | « Source/core/animation/TimedItem.h ('k') | Source/core/animation/TimedItemTest.cpp » ('j') | Source/core/frame/FrameView.cpp » ('J')