Move Priority enum/field to KeyframeEffectReadOnly

third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 494 matching lines @@
     animation.update(TimingUpdateOnDemand);
     m_runningAnimations.remove(cancelledIndices[i]);
   }
 
   for (const auto& entry : m_pendingUpdate.newAnimations()) {
     const InertEffect* inertAnimation = entry.effect.get();
     AnimationEventDelegate* eventDelegate =
         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())
       animation->pause();
     animation->update(TimingUpdateOnDemand);
 
     m_runningAnimations.append(new RunningAnimation(animation, entry));
   }
 
   // Transitions that are run on the compositor only update main-thread state
@@ skipping 83 matching lines @@
         newFrames[0]->setPropertyValue(
             id, toLegacyStyleInterpolation(sample.at(0).get())->currentValue());
         newFrames[1]->setPropertyValue(
             id, toLegacyStyleInterpolation(sample.at(0).get())->currentValue());
         model = AnimatableValueKeyframeEffectModel::create(newFrames);
       }
     }
 
     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
     if (retargetedCompositorTransitions.contains(id))
       animation->setStartTime(element->document().timeline().currentTime());
     animation->update(TimingUpdateOnDemand);
     runningTransition.animation = animation;
     m_transitions.set(id, runningTransition);
     DCHECK_NE(id, CSSPropertyInvalid);
 
@@ skipping 220 matching lines @@
     CSSAnimationUpdate& update,
     const Element* animatingElement) {
   ElementAnimations* elementAnimations =
       animatingElement ? animatingElement->elementAnimations() : nullptr;
   AnimationStack* animationStack =
       elementAnimations ? &elementAnimations->animationStack() : nullptr;
 
   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;
   }
 
   HeapVector<Member<const InertEffect>> newEffects;
   for (const auto& newAnimation : update.newAnimations())
     newEffects.append(newAnimation.effect);
 
   // Animations with updates use a temporary InertEffect for the current frame.
   for (const auto& updatedAnimation : update.animationsWithUpdates())
     newEffects.append(updatedAnimation.effect);
 
   ActiveInterpolationsMap activeInterpolationsForAnimations(
       AnimationStack::activeInterpolations(
           animationStack, &newEffects, &update.suppressedAnimations(),
-          KeyframeEffect::DefaultPriority, isStylePropertyHandle));
+          KeyframeEffectReadOnly::DefaultPriority, isStylePropertyHandle));
   update.adoptActiveInterpolationsForAnimations(
       activeInterpolationsForAnimations);
 }
 
 void CSSAnimations::calculateTransitionActiveInterpolations(
     CSSAnimationUpdate& update,
     const Element* animatingElement) {
   ElementAnimations* elementAnimations =
       animatingElement ? animatingElement->elementAnimations() : nullptr;
   AnimationStack* animationStack =
       elementAnimations ? &elementAnimations->animationStack() : nullptr;
 
   ActiveInterpolationsMap activeInterpolationsForTransitions;
   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())
       newTransitions.append(entry.value.effect.get());
 
     HeapHashSet<Member<const Animation>> cancelledAnimations;
     if (!update.cancelledTransitions().isEmpty()) {
       DCHECK(elementAnimations);
       const TransitionMap& transitionMap =
           elementAnimations->cssAnimations().m_transitions;
       for (CSSPropertyID id : update.cancelledTransitions()) {
         DCHECK(transitionMap.contains(id));
         cancelledAnimations.add(transitionMap.get(id).animation.get());
       }
     }
 
     activeInterpolationsForTransitions = AnimationStack::activeInterpolations(
         animationStack, &newTransitions, &cancelledAnimations,
-        KeyframeEffect::TransitionPriority, isStylePropertyHandle);
+        KeyframeEffectReadOnly::TransitionPriority, isStylePropertyHandle);
   }
 
   // Properties being animated by animations don't get values from transitions
   // applied.
   if (!update.activeInterpolationsForAnimations().isEmpty() &&
       !activeInterpolationsForTransitions.isEmpty()) {
     for (const auto& entry : update.activeInterpolationsForAnimations())
       activeInterpolationsForTransitions.remove(entry.key);
   }
   update.adoptActiveInterpolationsForTransitions(
@@ skipping 157 matching lines @@
   return toShadowRoot(treeScope.rootNode()).host() == element;
 }
 
 DEFINE_TRACE(CSSAnimations) {
   visitor->trace(m_transitions);
   visitor->trace(m_pendingUpdate);
   visitor->trace(m_runningAnimations);
 }
 
 }  // namespace blink