CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/animation/ImageSliceStyleInterpolation.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/ImageSliceStyleInterpolation.h"
 
 #include "core/css/CSSBorderImageSliceValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/Rect.h"
 #include "core/css/resolver/StyleBuilder.h"
 
 namespace blink {
 
 bool ImageSliceStyleInterpolation::usesDefaultInterpolation(const CSSValue& start, const CSSValue& end)
 {
     if (!start.isBorderImageSliceValue() || !end.isBorderImageSliceValue())
         return true;
     const CSSBorderImageSliceValue& startSlice = toCSSBorderImageSliceValue(start);
     const CSSBorderImageSliceValue& endSlice = toCSSBorderImageSliceValue(end);
-    return startSlice.slices()->top()->isPercentage() != endSlice.slices()->top()->isPercentage()
+    return startSlice.slices()->top().isPercentage() != endSlice.slices()->top().isPercentage()
         || startSlice.m_fill != endSlice.m_fill;
 }
 
 namespace {
 
 class Decomposition {
     STACK_ALLOCATED();
 public:
     Decomposition(const CSSBorderImageSliceValue& value)
     {
         decompose(value);
     }
 
     OwnPtrWillBeMember<InterpolableValue> interpolableValue;
     ImageSliceStyleInterpolation::Metadata metadata;
 
 private:
     void decompose(const CSSBorderImageSliceValue& value)
     {
         const size_t kQuadSides = 4;
         OwnPtrWillBeRawPtr<InterpolableList> interpolableList = InterpolableList::create(kQuadSides);
         const Quad& quad = *value.slices();
-        interpolableList->set(0, InterpolableNumber::create(quad.top()->getDoubleValue()));
-        interpolableList->set(1, InterpolableNumber::create(quad.right()->getDoubleValue()));
-        interpolableList->set(2, InterpolableNumber::create(quad.bottom()->getDoubleValue()));
-        interpolableList->set(3, InterpolableNumber::create(quad.left()->getDoubleValue()));
-        bool isPercentage = quad.top()->isPercentage();
-        ASSERT(quad.bottom()->isPercentage() == isPercentage
-            && quad.left()->isPercentage() == isPercentage
-            && quad.right()->isPercentage() == isPercentage);
+        interpolableList->set(0, InterpolableNumber::create(quad.top().getDoubleValue()));
+        interpolableList->set(1, InterpolableNumber::create(quad.right().getDoubleValue()));
+        interpolableList->set(2, InterpolableNumber::create(quad.bottom().getDoubleValue()));
+        interpolableList->set(3, InterpolableNumber::create(quad.left().getDoubleValue()));
+        bool isPercentage = quad.top().isPercentage();
+        ASSERT(quad.bottom().isPercentage() == isPercentage
+            && quad.left().isPercentage() == isPercentage
+            && quad.right().isPercentage() == isPercentage);
 
         interpolableValue = interpolableList.release();
         metadata = ImageSliceStyleInterpolation::Metadata {isPercentage, value.m_fill};
     }
 };
 
 PassRefPtrWillBeRawPtr<CSSBorderImageSliceValue> compose(const InterpolableValue& value, const ImageSliceStyleInterpolation::Metadata& metadata)
 {
     const InterpolableList& interpolableList = toInterpolableList(value);
     CSSPrimitiveValue::UnitType type = metadata.isPercentage ? CSSPrimitiveValue::CSS_PERCENTAGE : CSSPrimitiveValue::CSS_NUMBER;
@@ skipping 29 matching lines @@
 {
     StyleBuilder::applyProperty(m_id, state, *compose(*m_cachedValue, m_metadata));
 }
 
 DEFINE_TRACE(ImageSliceStyleInterpolation)
 {
     StyleInterpolation::trace(visitor);
 }
 
 } // namespace blink