Code clean up: Rename SampledEffect variables to sampledEffect instead of effect

third_party/WebKit/Source/core/animation/AnimationStack.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 43 matching lines @@
             && (RuntimeEnabledFeatures::stackedCSSPropertyAnimationsEnabled() || !property.isCSSProperty() || property.isPresentationAttribute())
             && interpolation->isInvalidatableInterpolation()
             && toInvalidatableInterpolation(*interpolation).dependsOnUnderlyingValue()) {
             activeInterpolations.append(interpolation.get());
         } else {
             activeInterpolations.at(0) = interpolation.get();
         }
     }
 }
 
-bool compareEffects(const Member<SampledEffect>& effect1, const Member<SampledEffect>& effect2)
+bool compareSampledEffects(const Member<SampledEffect>& sampledEffect1, const Member<SampledEffect>& sampledEffect2)
 {
-    ASSERT(effect1 && effect2);
-    return effect1->sequenceNumber() < effect2->sequenceNumber();
+    ASSERT(sampledEffect1 && sampledEffect2);
+    return sampledEffect1->sequenceNumber() < sampledEffect2->sequenceNumber();
 }
 
 void copyNewAnimationsToActiveInterpolationsMap(const HeapVector<Member<const InertEffect>>& newAnimations, AnimationStack::PropertyHandleFilter propertyHandleFilter, ActiveInterpolationsMap& result)
 {
     for (const auto& newAnimation : newAnimations) {
         Vector<RefPtr<Interpolation>> sample;
         newAnimation->sample(sample);
         if (!sample.isEmpty())
             copyToActiveInterpolationsMap(sample, propertyHandleFilter, result);
     }
 }
 
 } // namespace
 
 AnimationStack::AnimationStack()
 {
 }
 
 bool AnimationStack::hasActiveAnimationsOnCompositor(CSSPropertyID property) const
 {
-    for (const auto& sampledEffect : m_effects) {
+    for (const auto& sampledEffect : m_sampledEffects) {
         // TODO(dstockwell): move the playing check into AnimationEffect and expose both hasAnimations and hasActiveAnimations
         if (sampledEffect->effect() && sampledEffect->effect()->animation()->playing() && sampledEffect->effect()->hasActiveAnimationsOnCompositor(property))
             return true;
     }
     return false;
 }
 
 ActiveInterpolationsMap AnimationStack::activeInterpolations(AnimationStack* animationStack, const HeapVector<Member<const InertEffect>>* newAnimations, const HeapHashSet<Member<const Animation>>* suppressedAnimations, KeyframeEffect::Priority priority, PropertyHandleFilter propertyHandleFilter)
 {
     ActiveInterpolationsMap result;
 
     if (animationStack) {
-        HeapVector<Member<SampledEffect>>& effects = animationStack->m_effects;
+        HeapVector<Member<SampledEffect>>& sampledEffects = animationStack->m_sampledEffects;
         // std::sort doesn't work with OwnPtrs
-        nonCopyingSort(effects.begin(), effects.end(), compareEffects);
-        animationStack->removeClearedEffects();
-        for (const auto& effect : effects) {
-            if (effect->priority() != priority || (suppressedAnimations && effect->effect() && suppressedAnimations->contains(effect->effect()->animation())))
+        nonCopyingSort(sampledEffects.begin(), sampledEffects.end(), compareSampledEffects);
+        animationStack->removeClearedSampledEffects();
+        for (const auto& sampledEffect : sampledEffects) {
+            if (sampledEffect->priority() != priority || (suppressedAnimations && sampledEffect->effect() && suppressedAnimations->contains(sampledEffect->effect()->animation())))
                 continue;
-            copyToActiveInterpolationsMap(effect->interpolations(), propertyHandleFilter, result);
+            copyToActiveInterpolationsMap(sampledEffect->interpolations(), propertyHandleFilter, result);
         }
     }
 
     if (newAnimations)
         copyNewAnimationsToActiveInterpolationsMap(*newAnimations, propertyHandleFilter, result);
 
     return result;
 }
 
-void AnimationStack::removeClearedEffects()
+void AnimationStack::removeClearedSampledEffects()
 {
     size_t dest = 0;
-    for (auto& effect : m_effects) {
-        if (effect->effect())
-            m_effects[dest++].swap(effect);
+    for (auto& sampledEffect : m_sampledEffects) {
+        if (sampledEffect->effect())
+            m_sampledEffects[dest++].swap(sampledEffect);
     }
-    m_effects.shrink(dest);
+    m_sampledEffects.shrink(dest);
 }
 
 DEFINE_TRACE(AnimationStack)
 {
-    visitor->trace(m_effects);
+    visitor->trace(m_sampledEffects);
 }
 
 bool AnimationStack::getAnimatedBoundingBox(FloatBox& box, CSSPropertyID property) const
 {
     FloatBox originalBox(box);
-    for (const auto& sampledEffect : m_effects) {
+    for (const auto& sampledEffect : m_sampledEffects) {
         if (sampledEffect->effect() && sampledEffect->effect()->affects(PropertyHandle(property))) {
             KeyframeEffect* effect = sampledEffect->effect();
             const Timing& timing = effect->specifiedTiming();
             double startRange = 0;
             double endRange = 1;
             timing.timingFunction->range(&startRange, &endRange);
             FloatBox expandingBox(originalBox);
             if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expandingBox, *effect->model(), startRange, endRange))
                 return false;
             box.expandTo(expandingBox);
         }
     }
     return true;
 }
 
 } // namespace blink