Revert of Make InvalidatableInterpolation's InterpolationTypes decided at effect application time

third_party/WebKit/Source/core/animation/InvalidatableInterpolation.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/animation/InvalidatableInterpolation.h"
 
 #include "core/animation/InterpolationEnvironment.h"
 #include "core/animation/StringKeyframe.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include <memory>
@@ skipping 14 matching lines @@
     m_cachedPairConversion->interpolateValue(fraction, m_cachedValue);
   // We defer the interpolation to ensureValidConversion() if
   // m_cachedPairConversion is null.
 }
 
 std::unique_ptr<PairwisePrimitiveInterpolation>
 InvalidatableInterpolation::maybeConvertPairwise(
     const InterpolationEnvironment& environment,
     const UnderlyingValueOwner& underlyingValueOwner) const {
   DCHECK(m_currentFraction != 0 && m_currentFraction != 1);
-  for (const auto& interpolationType : *m_interpolationTypes) {
+  for (const auto& interpolationType : m_interpolationTypes) {
     if ((m_startKeyframe->isNeutral() || m_endKeyframe->isNeutral()) &&
         (!underlyingValueOwner ||
          underlyingValueOwner.type() != *interpolationType))
       continue;
     ConversionCheckers conversionCheckers;
     PairwiseInterpolationValue result = interpolationType->maybeConvertPairwise(
         *m_startKeyframe, *m_endKeyframe, environment,
         underlyingValueOwner.value(), conversionCheckers);
     addConversionCheckers(*interpolationType, conversionCheckers);
     if (result) {
       return PairwisePrimitiveInterpolation::create(
           *interpolationType, std::move(result.startInterpolableValue),
           std::move(result.endInterpolableValue),
           result.nonInterpolableValue.release());
     }
   }
   return nullptr;
 }
 
 std::unique_ptr<TypedInterpolationValue>
 InvalidatableInterpolation::convertSingleKeyframe(
     const PropertySpecificKeyframe& keyframe,
     const InterpolationEnvironment& environment,
     const UnderlyingValueOwner& underlyingValueOwner) const {
   if (keyframe.isNeutral() && !underlyingValueOwner)
     return nullptr;
-  for (const auto& interpolationType : *m_interpolationTypes) {
+  for (const auto& interpolationType : m_interpolationTypes) {
     if (keyframe.isNeutral() &&
         underlyingValueOwner.type() != *interpolationType)
       continue;
     ConversionCheckers conversionCheckers;
     InterpolationValue result = interpolationType->maybeConvertSingle(
         keyframe, environment, underlyingValueOwner.value(),
         conversionCheckers);
     addConversionCheckers(*interpolationType, conversionCheckers);
     if (result)
       return TypedInterpolationValue::create(
           *interpolationType, std::move(result.interpolableValue),
           result.nonInterpolableValue.release());
   }
   DCHECK(keyframe.isNeutral());
   return nullptr;
 }
 
 void InvalidatableInterpolation::addConversionCheckers(
     const InterpolationType& type,
     ConversionCheckers& conversionCheckers) const {
   for (size_t i = 0; i < conversionCheckers.size(); i++) {
     conversionCheckers[i]->setType(type);
     m_conversionCheckers.append(std::move(conversionCheckers[i]));
   }
 }
 
 std::unique_ptr<TypedInterpolationValue>
 InvalidatableInterpolation::maybeConvertUnderlyingValue(
     const InterpolationEnvironment& environment) const {
-  for (const auto& interpolationType : *m_interpolationTypes) {
+  for (const auto& interpolationType : m_interpolationTypes) {
     InterpolationValue result =
         interpolationType->maybeConvertUnderlyingValue(environment);
     if (result)
       return TypedInterpolationValue::create(
           *interpolationType, std::move(result.interpolableValue),
           result.nonInterpolableValue.release());
   }
   return nullptr;
 }
 
@@ skipping 34 matching lines @@
       return false;
   }
   return true;
 }
 
 const TypedInterpolationValue*
 InvalidatableInterpolation::ensureValidConversion(
     const InterpolationEnvironment& environment,
     const UnderlyingValueOwner& underlyingValueOwner) const {
   DCHECK(!std::isnan(m_currentFraction));
-  DCHECK(m_interpolationTypes &&
-         m_interpolationTypesVersion ==
-             environment.interpolationTypesMap().version());
   if (isConversionCacheValid(environment, underlyingValueOwner))
     return m_cachedValue.get();
   clearConversionCache();
   if (m_currentFraction == 0) {
     m_cachedValue = convertSingleKeyframe(*m_startKeyframe, environment,
                                           underlyingValueOwner);
   } else if (m_currentFraction == 1) {
     m_cachedValue = convertSingleKeyframe(*m_endKeyframe, environment,
                                           underlyingValueOwner);
   } else {
     std::unique_ptr<PairwisePrimitiveInterpolation> pairwiseConversion =
         maybeConvertPairwise(environment, underlyingValueOwner);
     if (pairwiseConversion) {
       m_cachedValue = pairwiseConversion->initialValue();
       m_cachedPairConversion = std::move(pairwiseConversion);
     } else {
       m_cachedPairConversion = FlipPrimitiveInterpolation::create(
           convertSingleKeyframe(*m_startKeyframe, environment,
                                 underlyingValueOwner),
           convertSingleKeyframe(*m_endKeyframe, environment,
                                 underlyingValueOwner));
     }
     m_cachedPairConversion->interpolateValue(m_currentFraction, m_cachedValue);
   }
   m_isConversionCached = true;
   return m_cachedValue.get();
 }
 
-void InvalidatableInterpolation::ensureValidInterpolationTypes(
-    const InterpolationEnvironment& environment) const {
-  const InterpolationTypesMap& map = environment.interpolationTypesMap();
-  size_t latestVersion = map.version();
-  if (m_interpolationTypes && m_interpolationTypesVersion == latestVersion) {
-    return;
-  }
-  const InterpolationTypes* latestInterpolationTypes = &map.get(m_property);
-  DCHECK(latestInterpolationTypes);
-  if (m_interpolationTypes != latestInterpolationTypes) {
-    clearConversionCache();
-  }
-  m_interpolationTypes = latestInterpolationTypes;
-  m_interpolationTypesVersion = latestVersion;
-}
-
 void InvalidatableInterpolation::setFlagIfInheritUsed(
     InterpolationEnvironment& environment) const {
   if (!m_property.isCSSProperty() && !m_property.isPresentationAttribute())
     return;
   if (!environment.state().parentStyle())
     return;
   const CSSValue* startValue =
       toCSSPropertySpecificKeyframe(*m_startKeyframe).value();
   const CSSValue* endValue =
       toCSSPropertySpecificKeyframe(*m_endKeyframe).value();
@@ skipping 16 matching lines @@
 void InvalidatableInterpolation::applyStack(
     const ActiveInterpolations& interpolations,
     InterpolationEnvironment& environment) {
   DCHECK(!interpolations.isEmpty());
   size_t startingIndex = 0;
 
   // Compute the underlying value to composite onto.
   UnderlyingValueOwner underlyingValueOwner;
   const InvalidatableInterpolation& firstInterpolation =
       toInvalidatableInterpolation(*interpolations.at(startingIndex));
-  firstInterpolation.ensureValidInterpolationTypes(environment);
   if (firstInterpolation.dependsOnUnderlyingValue()) {
     underlyingValueOwner.set(
         firstInterpolation.maybeConvertUnderlyingValue(environment));
   } else {
     const TypedInterpolationValue* firstValue =
         firstInterpolation.ensureValidConversion(environment,
                                                  underlyingValueOwner);
     // Fast path for replace interpolations that are the only one to apply.
     if (interpolations.size() == 1) {
       if (firstValue) {
         firstInterpolation.setFlagIfInheritUsed(environment);
         firstValue->type().apply(firstValue->interpolableValue(),
                                  firstValue->getNonInterpolableValue(),
                                  environment);
       }
       return;
     }
     underlyingValueOwner.set(firstValue);
     startingIndex++;
   }
 
   // Composite interpolations onto the underlying value.
   bool shouldApply = false;
   for (size_t i = startingIndex; i < interpolations.size(); i++) {
     const InvalidatableInterpolation& currentInterpolation =
         toInvalidatableInterpolation(*interpolations.at(i));
     DCHECK(currentInterpolation.dependsOnUnderlyingValue());
-    currentInterpolation.ensureValidInterpolationTypes(environment);
     const TypedInterpolationValue* currentValue =
         currentInterpolation.ensureValidConversion(environment,
                                                    underlyingValueOwner);
     if (!currentValue)
       continue;
     shouldApply = true;
     currentInterpolation.setFlagIfInheritUsed(environment);
     double underlyingFraction = currentInterpolation.underlyingFraction();
     if (underlyingFraction == 0 || !underlyingValueOwner ||
         underlyingValueOwner.type() != currentValue->type())
       underlyingValueOwner.set(currentValue);
     else
       currentValue->type().composite(underlyingValueOwner, underlyingFraction,
                                      currentValue->value(),
                                      currentInterpolation.m_currentFraction);
   }
 
   if (shouldApply && underlyingValueOwner)
     underlyingValueOwner.type().apply(
         *underlyingValueOwner.value().interpolableValue,
         underlyingValueOwner.value().nonInterpolableValue.get(), environment);
 }
 
 }  // namespace blink