Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp

Issue 2394993002: Move Priority enum/field to KeyframeEffectReadOnly (Closed)
Patch Set: 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
Index: third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp b/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
index 0ab1173dc676ef47fc1df5599cf527d5d57efc55..4457ce2e26704978c7a09012d8ea4feab47728c8 100644
--- a/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
+++ b/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
@@ -512,7 +512,7 @@ void CSSAnimations::maybeApplyPendingUpdate(Element* element) {
new AnimationEventDelegate(element, entry.name);
KeyframeEffect* effect = KeyframeEffect::create(
element, inertAnimation->model(), inertAnimation->specifiedTiming(),
- KeyframeEffect::DefaultPriority, eventDelegate);
+ KeyframeEffectReadOnly::DefaultPriority, eventDelegate);
Animation* animation = element->document().timeline().play(effect);
animation->setId(entry.name);
if (inertAnimation->paused())
@@ -616,7 +616,7 @@ void CSSAnimations::maybeApplyPendingUpdate(Element* element) {
KeyframeEffect* transition = KeyframeEffect::create(
element, model, inertAnimation->specifiedTiming(),
- KeyframeEffect::TransitionPriority, eventDelegate);
+ KeyframeEffectReadOnly::TransitionPriority, eventDelegate);
Animation* animation = element->document().timeline().play(transition);
animation->setId(getPropertyName(newTransition.id));
// Set the current time as the start time for retargeted transitions
@@ -857,9 +857,9 @@ void CSSAnimations::calculateAnimationActiveInterpolations(
if (update.newAnimations().isEmpty() &&
update.suppressedAnimations().isEmpty()) {
ActiveInterpolationsMap activeInterpolationsForAnimations(
- AnimationStack::activeInterpolations(animationStack, nullptr, nullptr,
- KeyframeEffect::DefaultPriority,
- isStylePropertyHandle));
+ AnimationStack::activeInterpolations(
+ animationStack, nullptr, nullptr,
+ KeyframeEffectReadOnly::DefaultPriority, isStylePropertyHandle));
update.adoptActiveInterpolationsForAnimations(
activeInterpolationsForAnimations);
return;
@@ -876,7 +876,7 @@ void CSSAnimations::calculateAnimationActiveInterpolations(
ActiveInterpolationsMap activeInterpolationsForAnimations(
AnimationStack::activeInterpolations(
animationStack, &newEffects, &update.suppressedAnimations(),
- KeyframeEffect::DefaultPriority, isStylePropertyHandle));
+ KeyframeEffectReadOnly::DefaultPriority, isStylePropertyHandle));
update.adoptActiveInterpolationsForAnimations(
activeInterpolationsForAnimations);
}
@@ -893,8 +893,8 @@ void CSSAnimations::calculateTransitionActiveInterpolations(
if (update.newTransitions().isEmpty() &&
update.cancelledTransitions().isEmpty()) {
activeInterpolationsForTransitions = AnimationStack::activeInterpolations(
- animationStack, nullptr, nullptr, KeyframeEffect::TransitionPriority,
- isStylePropertyHandle);
+ animationStack, nullptr, nullptr,
+ KeyframeEffectReadOnly::TransitionPriority, isStylePropertyHandle);
} else {
HeapVector<Member<const InertEffect>> newTransitions;
for (const auto& entry : update.newTransitions())
@@ -913,7 +913,7 @@ void CSSAnimations::calculateTransitionActiveInterpolations(
activeInterpolationsForTransitions = AnimationStack::activeInterpolations(
animationStack, &newTransitions, &cancelledAnimations,
- KeyframeEffect::TransitionPriority, isStylePropertyHandle);
+ KeyframeEffectReadOnly::TransitionPriority, isStylePropertyHandle);
}
// Properties being animated by animations don't get values from transitions
« no previous file with comments | « third_party/WebKit/Source/core/animation/SampledEffect.h ('k') | third_party/WebKit/Source/core/svg/SVGElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698