Add mutableComponent() interface to InterpolationValue

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 103 matching lines @@
 void InvalidatableStyleInterpolation::setFlagIfInheritUsed(StyleResolverState& state) const
 {
     if (!state.parentStyle())
         return;
     if ((m_startKeyframe->value() && m_startKeyframe->value()->isInheritedValue())
         || (m_endKeyframe->value() && m_endKeyframe->value()->isInheritedValue())) {
         state.parentStyle()->setHasExplicitlyInheritedProperties();
     }
 }
 
+double InvalidatableStyleInterpolation::underlyingFraction() const
+{
+    return m_cachedConversion->interpolateUnderlyingFraction(m_startKeyframe->underlyingFraction(), m_endKeyframe->underlyingFraction(), m_currentFraction);
+}
+
 // Handles memory management of underlying InterpolationValues in applyStack()
 // Ensures we perform copy on write if we are not the owner of an underlying InterpolationValue.
 // This functions similar to a DataRef except on OwnPtr'd objects.
 class UnderlyingValue {
     STACK_ALLOCATED();
+
 public:
     UnderlyingValue()
-        : m_owner()
-        , m_pointer(nullptr)
+        : m_valueOwner(nullptr)
+        , m_value(nullptr)
     { }
 
     void set(const InterpolationValue* interpolationValue)
     {
-        // By clearing m_owner we will perform a copy when attempting to access()
-        // m_pointer as a mutable reference, thus upholding the const contract for
-        // this instance of interpolationValue despite the const_cast.
-        m_owner.clear();
-        m_pointer = const_cast<InterpolationValue*>(interpolationValue);
+        // By clearing m_valueOwner we will perform a copy before attempting to mutate m_value,
+        // thus upholding the const contract for this instance of interpolationValue despite the const_cast.
+        m_valueOwner.clear();
+        m_value = const_cast<InterpolationValue*>(interpolationValue);
     }
     void set(PassOwnPtr<InterpolationValue> interpolationValue)
     {
-        m_owner = interpolationValue;
-        m_pointer = m_owner.get();
+        m_valueOwner = interpolationValue;
+        m_value = m_valueOwner.get();
     }
-    InterpolationValue& access()
+    InterpolationComponentValue& mutableComponent()
     {
-        ASSERT(m_pointer);
-        if (!m_owner)
-            set(m_pointer->clone());
-        return *m_pointer;
+        ASSERT(m_value);
+        if (!m_valueOwner)
+            set(m_value->clone());
+        return m_value->mutableComponent();
     }
-    const InterpolationValue* get() const { return m_pointer; }
-    operator bool() const { return m_pointer; }
+    const InterpolationValue* get() const { return m_value; }
+    operator bool() const { return m_value; }
     const InterpolationValue* operator->() const
     {
-        ASSERT(m_pointer);
-        return m_pointer;
+        ASSERT(m_value);
+        return m_value;
     }
 
 private:
-    OwnPtr<InterpolationValue> m_owner;
-    InterpolationValue* m_pointer;
+    OwnPtr<InterpolationValue> m_valueOwner;
+    InterpolationValue* m_value;
 };
 
 void InvalidatableStyleInterpolation::applyStack(const ActiveInterpolations& interpolations, StyleResolverState& state)
 {
     ASSERT(!interpolations.isEmpty());
     size_t startingIndex = 0;
 
     // Compute the underlying value to composite onto.
     UnderlyingValue underlyingValue;
     const InvalidatableStyleInterpolation& firstInterpolation = toInvalidatableStyleInterpolation(*interpolations.at(startingIndex));
@@ skipping 16 matching lines @@
     // Composite interpolations onto the underlying value.
     bool shouldApply = false;
     for (size_t i = startingIndex; i < interpolations.size(); i++) {
         const InvalidatableStyleInterpolation& currentInterpolation = toInvalidatableStyleInterpolation(*interpolations.at(i));
         ASSERT(currentInterpolation.dependsOnUnderlyingValue());
         const InterpolationValue* currentValue = currentInterpolation.ensureValidInterpolation(state, underlyingValue.get());
         if (!currentValue)
             continue;
         shouldApply = true;
         currentInterpolation.setFlagIfInheritUsed(state);
-        if (!underlyingValue || underlyingValue->type() != currentValue->type()) {
+        double underlyingFraction = currentInterpolation.underlyingFraction();
+        if (underlyingFraction == 0 || !underlyingValue || underlyingValue->type() != currentValue->type())
             underlyingValue.set(currentValue);
-        } else {
-            double underlyingFraction = currentInterpolation.m_cachedConversion->interpolateUnderlyingFraction(
-                currentInterpolation.m_startKeyframe->underlyingFraction(),
-                currentInterpolation.m_endKeyframe->underlyingFraction(),
-                currentInterpolation.m_currentFraction);
-            underlyingValue.access().interpolableValue().scaleAndAdd(underlyingFraction, currentInterpolation.m_cachedValue->interpolableValue());
-        }
+        else
+            underlyingValue.mutableComponent().interpolableValue->scaleAndAdd(underlyingFraction, currentValue->interpolableValue());
     }
 
     if (shouldApply && underlyingValue)
         underlyingValue->type().apply(underlyingValue->interpolableValue(), underlyingValue->nonInterpolableValue(), state);
 }
 
 } // namespace blink