| Index: Source/core/animation/FilterStyleInterpolation.cpp
|
| diff --git a/Source/core/animation/FilterStyleInterpolation.cpp b/Source/core/animation/FilterStyleInterpolation.cpp
|
| index 4d063c0778be3836c2aaa044ddff34b0c15a65b7..ec00341afeb485cca949de4aaa2dabc194a43241 100644
|
| --- a/Source/core/animation/FilterStyleInterpolation.cpp
|
| +++ b/Source/core/animation/FilterStyleInterpolation.cpp
|
| @@ -13,9 +13,9 @@ namespace blink {
|
|
|
| namespace {
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValueList> extendFilterList(const CSSValueList& shortFilterList, const CSSValueList& otherFilterList)
|
| +PassRefPtr<CSSValueList> extendFilterList(const CSSValueList& shortFilterList, const CSSValueList& otherFilterList)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
|
| CSSValueList::const_iterator shortIter = shortFilterList.begin();
|
| CSSValueList::const_iterator otherIter = otherFilterList.begin();
|
| while (shortIter != shortFilterList.end()) {
|
| @@ -25,7 +25,7 @@ PassRefPtrWillBeRawPtr<CSSValueList> extendFilterList(const CSSValueList& shortF
|
| }
|
| while (otherIter != otherFilterList.end()) {
|
| CSSFunctionValue* function = toCSSFunctionValue(otherIter->get());
|
| - RefPtrWillBeRawPtr<CSSValueList> defaultFunction = CSSFunctionValue::create(function->functionType());
|
| + RefPtr<CSSValueList> defaultFunction = CSSFunctionValue::create(function->functionType());
|
| switch (function->functionType()) {
|
| case CSSValueUrl:
|
| // Discrete interpolation occurs - see canCreateFrom.
|
| @@ -97,13 +97,13 @@ bool FilterStyleInterpolation::canCreateFrom(const CSSValue& start, const CSSVal
|
| && startFunctionType != CSSValueDropShadow;
|
| }
|
|
|
| -PassOwnPtrWillBeRawPtr<InterpolableValue> FilterStyleInterpolation::toInterpolableValue(const CSSValue& value, CSSValueID& functionType)
|
| +PassOwnPtr<InterpolableValue> FilterStyleInterpolation::toInterpolableValue(const CSSValue& value, CSSValueID& functionType)
|
| {
|
| const CSSFunctionValue& filterValue = toCSSFunctionValue(value);
|
| functionType = filterValue.functionType();
|
| size_t length = filterValue.length();
|
|
|
| - OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(length);
|
| + OwnPtr<InterpolableList> result = InterpolableList::create(length);
|
| for (size_t i = 0; i < length; ++i) {
|
| switch (functionType) {
|
| case CSSValueHueRotate:
|
| @@ -130,11 +130,11 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> FilterStyleInterpolation::toInterpolab
|
| return result.release();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSFunctionValue> FilterStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, CSSValueID functionType, InterpolationRange)
|
| +PassRefPtr<CSSFunctionValue> FilterStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, CSSValueID functionType, InterpolationRange)
|
| {
|
| const InterpolableList& list = toInterpolableList(value);
|
| size_t length = list.length();
|
| - RefPtrWillBeRawPtr<CSSFunctionValue> result = CSSFunctionValue::create(functionType);
|
| + RefPtr<CSSFunctionValue> result = CSSFunctionValue::create(functionType);
|
| for (size_t i = 0; i < length; ++i) {
|
| switch (functionType) {
|
| case CSSValueGrayscale:
|
|
|