third_party/WebKit/Source/core/animation/AnimationEffectReadOnly.cpp - Issue 2398373002: Construct KeyframeEffectReadOnly objects

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: third_party/WebKit/Source/core/animation/AnimationEffectReadOnly.cpp

Issue 2398373002: Construct KeyframeEffectReadOnly objects (Closed)

Patch Set: Test tweaks in response to review Created 4 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

« no previous file with comments | « third_party/WebKit/Source/core/animation/Animation.cpp ('k') | third_party/WebKit/Source/core/animation/ElementAnimation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/animation/AnimationEffectReadOnly.cpp

diff --git a/third_party/WebKit/Source/core/animation/AnimationEffectReadOnly.cpp b/third_party/WebKit/Source/core/animation/AnimationEffectReadOnly.cpp

index 0b4a0f99cea4145ad1b3a4c93137e68490b8d269..30749f0870323175f20f29708acfb951a9a42a95 100644

--- a/third_party/WebKit/Source/core/animation/AnimationEffectReadOnly.cpp

+++ b/third_party/WebKit/Source/core/animation/AnimationEffectReadOnly.cpp

@@ -112,8 +112,8 @@ void AnimationEffectReadOnly::getComputedTiming(

// KeyframeEffectOptions members.

computedTiming.setDelay(specifiedTiming().startDelay * 1000);

computedTiming.setEndDelay(specifiedTiming().endDelay * 1000);

- computedTiming.setFill(Timing::fillModeString(

- resolvedFillMode(specifiedTiming().fillMode, isKeyframeEffect())));

+ computedTiming.setFill(Timing::fillModeString(resolvedFillMode(

+ specifiedTiming().fillMode, isKeyframeEffectReadOnly())));

computedTiming.setIterationStart(specifiedTiming().iterationStart);

computedTiming.setIterations(specifiedTiming().iterationCount);

@@ -153,7 +153,8 @@ void AnimationEffectReadOnly::updateInheritedTime(

const AnimationEffectReadOnly::Phase parentPhase =

AnimationEffectReadOnly::PhaseActive;

const double activeTime = calculateActiveTime(

- activeDuration, resolvedFillMode(m_timing.fillMode, isKeyframeEffect()),

+ activeDuration,

+ resolvedFillMode(m_timing.fillMode, isKeyframeEffectReadOnly()),

localTime, parentPhase, currentPhase, m_timing);

double currentIteration;

@@ -206,7 +207,7 @@ void AnimationEffectReadOnly::updateInheritedTime(

calculatePhase(localActiveDuration, localLocalTime, m_timing);

const double localActiveTime = calculateActiveTime(

localActiveDuration,

- resolvedFillMode(m_timing.fillMode, isKeyframeEffect()),

+ resolvedFillMode(m_timing.fillMode, isKeyframeEffectReadOnly()),

localLocalTime, parentPhase, localCurrentPhase, m_timing);

const double startOffset =

m_timing.iterationStart * localIterationDuration;