Source/core/animation/TimedItem.cpp - Issue 28263002: Plumb timeToNextEffect through players and animation

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: Source/core/animation/TimedItem.cpp

Issue 28263002: Plumb timeToNextEffect through players and animation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Moved location of timeToEffectChange calculation 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 unified diff | Download patch

« Source/core/animation/DocumentTimeline.cpp ('K') | « Source/core/animation/TimedItem.h ('k') | Source/core/animation/TimedItemTest.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Google Inc. All rights reserved.	2 * Copyright (C) 2013 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 90 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
101 m_calculated.isCurrent = phase() == PhaseBefore \|\| isInPlay() \|\| (m_parent & & m_parent->isCurrent());	101 m_calculated.isCurrent = phase() == PhaseBefore \|\| isInPlay() \|\| (m_parent & & m_parent->isCurrent());

102	102

103 // This logic is specific to CSS animation events and assumes that all	103 // This logic is specific to CSS animation events and assumes that all

104 // animations start after the DocumentTimeline has started.	104 // animations start after the DocumentTimeline has started.

105 if (m_eventDelegate && (m_isFirstSample \|\| previousPhase != phase() \|\| (phas e() == PhaseActive && previousIteration != currentIteration)))	105 if (m_eventDelegate && (m_isFirstSample \|\| previousPhase != phase() \|\| (phas e() == PhaseActive && previousIteration != currentIteration)))

106 m_eventDelegate->onEventCondition(this, m_isFirstSample, previousPhase, previousIteration);	106 m_eventDelegate->onEventCondition(this, m_isFirstSample, previousPhase, previousIteration);

107 m_isFirstSample = false;	107 m_isFirstSample = false;

108	108

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

110 updateChildrenAndEffects(wasInEffect);	110 updateChildrenAndEffects(wasInEffect);

	111

	112 m_calculated.timeToEffectChange = calculateTimeToEffectChange(localTime, m_s tartTime + m_specified.startDelay, m_calculated.phase);

	113

111 }	114 }

112	115

113 } // namespace WebCore	116 } // namespace WebCore

OLD	NEW