Move interpolated Length unit types out of InterpolableValue into NonInterpolableValue

Source/core/animation/InvalidatableStyleInterpolation.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 "config.h"
 #include "core/animation/InvalidatableStyleInterpolation.h"
 
 #include "core/animation/StringKeyframe.h"
 #include "core/css/resolver/StyleResolverState.h"
 
@@ skipping 108 matching lines @@
         state.parentStyle()->setHasExplicitlyInheritedProperties();
     }
 }
 
 void InvalidatableStyleInterpolation::apply(StyleResolverState& state) const
 {
     OwnPtrWillBeRawPtr<InterpolationValue> underlyingValue = dependsOnUnderlyingValue() ? maybeConvertUnderlyingValue(state) : nullptr;
     ensureValidInterpolation(state, underlyingValue.get());
     if (!m_cachedValue)
         return;
-    const InterpolableValue* appliedInterpolableValue = &m_cachedValue->interpolableValue();
+    const InterpolationValue* appliedValue = m_cachedValue.get();
     if (underlyingValue && m_cachedValue->type() == underlyingValue->type()) {
+        appliedValue = underlyingValue.get();
         double underlyingFraction = m_cachedConversion->interpolateUnderlyingFraction(m_startKeyframe.underlyingFraction(), m_endKeyframe.underlyingFraction(), m_currentFraction);
         underlyingValue->interpolableValue().scaleAndAdd(underlyingFraction, m_cachedValue->interpolableValue());
-        appliedInterpolableValue = &underlyingValue->interpolableValue();
+        underlyingValue->setNonInterpolableValue(m_cachedValue->type().mergeNonInterpolableValues(underlyingValue->nonInterpolableValue(), m_cachedValue->nonInterpolableValue()));

[dstockwell, 2015/08/31 06:44:26]

It seems odd to modify the underlying value. Should these use appliedValue? I
realize they are the same instance.

[alancutter (OOO until 2018), 2015/09/01 00:26:00]

Done.

     }
-    m_cachedValue->type().apply(*appliedInterpolableValue, m_cachedValue->nonInterpolableValue(), state);
+    appliedValue->type().apply(appliedValue->interpolableValue(), appliedValue->nonInterpolableValue(), state);
     setFlagIfInheritUsed(state);
 }
 
 } // namespace blink