Oilpan: Unship CSSValues and AnimatableValues

Source/core/animation/LengthStyleInterpolation.cpp

 // Copyright 2014 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/LengthStyleInterpolation.h"
 
 #include "core/animation/css/CSSAnimatableValueFactory.h"
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/resolver/StyleBuilder.h"
@@ skipping 51 matching lines @@
 
     if (primitiveValue.isValueID()) {
         CSSValueID valueID = primitiveValue.getValueID();
         double pixels;
         return pixelsForKeyword(property, valueID, pixels);
     }
 
     return primitiveValue.isLength() || primitiveValue.isPercentage() || primitiveValue.isCalculatedPercentageWithLength();
 }
 
-PassOwnPtrWillBeRawPtr<InterpolableValue> LengthStyleInterpolation::toInterpolableValue(const CSSValue& value, CSSPropertyID id)
+PassOwnPtr<InterpolableValue> LengthStyleInterpolation::toInterpolableValue(const CSSValue& value, CSSPropertyID id)
 {
     ASSERT(canCreateFrom(value, id));
-    OwnPtrWillBeRawPtr<InterpolableList> listOfValuesAndTypes = InterpolableList::create(2);
-    OwnPtrWillBeRawPtr<InterpolableList> listOfValues = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount);
-    OwnPtrWillBeRawPtr<InterpolableList> listOfTypes = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount);
+    OwnPtr<InterpolableList> listOfValuesAndTypes = InterpolableList::create(2);
+    OwnPtr<InterpolableList> listOfValues = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount);
+    OwnPtr<InterpolableList> listOfTypes = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount);
 
     const CSSPrimitiveValue& primitive = toCSSPrimitiveValue(value);
 
     CSSLengthArray arrayOfValues;
     CSSPrimitiveValue::CSSLengthTypeArray arrayOfTypes;
     for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; i++)
         arrayOfValues.append(0);
 
     arrayOfTypes.ensureSize(CSSPrimitiveValue::LengthUnitTypeCount);
     if (primitive.isValueID()) {
@@ skipping 131 matching lines @@
     }
 }
 
 namespace {
 
 static CSSPrimitiveValue::UnitType toUnitType(int lengthUnitType)
 {
     return static_cast<CSSPrimitiveValue::UnitType>(CSSPrimitiveValue::lengthUnitTypeToUnitType(static_cast<CSSPrimitiveValue::LengthUnitType>(lengthUnitType)));
 }
 
-static PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> constructCalcExpression(const InterpolableList* list)
+static PassRefPtr<CSSCalcExpressionNode> constructCalcExpression(const InterpolableList* list)
 {
     const InterpolableList* listOfValues = toInterpolableList(list->get(0));
     const InterpolableList* listOfTypes = toInterpolableList(list->get(1));
-    RefPtrWillBeRawPtr<CSSCalcExpressionNode> expression = nullptr;
+    RefPtr<CSSCalcExpressionNode> expression = nullptr;
     for (size_t position = 0; position < CSSPrimitiveValue::LengthUnitTypeCount; position++) {
         const InterpolableNumber *subValueType = toInterpolableNumber(listOfTypes->get(position));
         if (!subValueType->value())
             continue;
         double value = toInterpolableNumber(listOfValues->get(position))->value();
-        RefPtrWillBeRawPtr<CSSCalcExpressionNode> currentTerm = CSSCalcValue::createExpressionNode(CSSPrimitiveValue::create(value, toUnitType(position)));
+        RefPtr<CSSCalcExpressionNode> currentTerm = CSSCalcValue::createExpressionNode(CSSPrimitiveValue::create(value, toUnitType(position)));
         if (expression)
             expression = CSSCalcValue::createExpressionNode(expression.release(), currentTerm.release(), CalcAdd);
         else
             expression = currentTerm.release();
     }
     return expression.release();
 }
 
 static double clampToRange(double x, ValueRange range)
 {
@@ skipping 19 matching lines @@
     if (hasPixels)
         return Length(CSSPrimitiveValue::clampToCSSLengthRange(clampToRange(pixelsAndPercent.pixels, range)), Fixed);
     if (hasPercent)
         return Length(clampToRange(pixelsAndPercent.percent, range), Percent);
     ASSERT_NOT_REACHED();
     return Length(0, Fixed);
 }
 
 }
 
-PassRefPtrWillBeRawPtr<CSSPrimitiveValue> LengthStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, InterpolationRange range)
+PassRefPtr<CSSPrimitiveValue> LengthStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, InterpolationRange range)
 {
     const InterpolableList* listOfValuesAndTypes = toInterpolableList(&value);
     const InterpolableList* listOfValues = toInterpolableList(listOfValuesAndTypes->get(0));
     const InterpolableList* listOfTypes = toInterpolableList(listOfValuesAndTypes->get(1));
     unsigned unitTypeCount = 0;
     for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; i++) {
         const InterpolableNumber* subType = toInterpolableNumber(listOfTypes->get(i));
         if (subType->value()) {
             unitTypeCount++;
         }
@@ skipping 18 matching lines @@
         ValueRange valueRange = (range == RangeNonNegative) ? ValueRangeNonNegative : ValueRangeAll;
         return CSSPrimitiveValue::create(CSSCalcValue::create(constructCalcExpression(listOfValuesAndTypes), valueRange));
     }
 }
 
 void LengthStyleInterpolation::applyInterpolableValue(CSSPropertyID property, const InterpolableValue& value, InterpolationRange range, StyleResolverState& state, LengthSetter lengthSetter)
 {
     if (lengthSetter && isPixelsOrPercentOnly(value)) {
         (state.style()->*lengthSetter)(lengthFromInterpolableValue(value, range, state.style()->effectiveZoom()));
 #if ENABLE(ASSERT)
-        RefPtrWillBeRawPtr<AnimatableValue> before = CSSAnimatableValueFactory::create(property, *state.style());
+        RefPtr<AnimatableValue> before = CSSAnimatableValueFactory::create(property, *state.style());
         StyleBuilder::applyProperty(property, state, fromInterpolableValue(value, range).get());
-        RefPtrWillBeRawPtr<AnimatableValue> after = CSSAnimatableValueFactory::create(property, *state.style());
+        RefPtr<AnimatableValue> after = CSSAnimatableValueFactory::create(property, *state.style());
         ASSERT(before->equals(*after));
 #endif
     } else {
         StyleBuilder::applyProperty(property, state, fromInterpolableValue(value, range).get());
     }
 }
 
 void LengthStyleInterpolation::apply(StyleResolverState& state) const
 {
     applyInterpolableValue(m_id, *m_cachedValue, m_range, state, m_lengthSetter);
 }
 
 DEFINE_TRACE(LengthStyleInterpolation)
 {
     StyleInterpolation::trace(visitor);
 }
 
 }