Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: Source/core/animation/FilterStyleInterpolation.cpp

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/animation/FilterStyleInterpolation.cpp
diff --git a/Source/core/animation/FilterStyleInterpolation.cpp b/Source/core/animation/FilterStyleInterpolation.cpp
index e26d66965e9d3d720c88f01a8efb5b7081f9095f..dcea3c86ad1d99e9992ce25bc3ef54d3ca226a5b 100644
--- a/Source/core/animation/FilterStyleInterpolation.cpp
+++ b/Source/core/animation/FilterStyleInterpolation.cpp
@@ -24,9 +24,9 @@ PassRefPtrWillBeRawPtr<CSSValueList> extendFilterList(const CSSValueList& shortF
++otherIter;
}
while (otherIter != otherFilterList.end()) {
- CSSFunctionValue* function = toCSSFunctionValue(otherIter->get());
- RefPtrWillBeRawPtr<CSSValueList> defaultFunction = CSSFunctionValue::create(function->functionType());
- switch (function->functionType()) {
+ CSSFunctionValue& function = toCSSFunctionValue(*otherIter);
+ RefPtrWillBeRawPtr<CSSValueList> defaultFunction = CSSFunctionValue::create(function.functionType());
+ switch (function.functionType()) {
case CSSValueUrl:
// Discrete interpolation occurs - see canCreateFrom.
break;
@@ -107,10 +107,10 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> FilterStyleInterpolation::toInterpolab
for (size_t i = 0; i < length; ++i) {
switch (functionType) {
case CSSValueHueRotate:
- result->set(i, InterpolableNumber::create(toCSSPrimitiveValue(filterValue.item(i))->computeDegrees()));
+ result->set(i, InterpolableNumber::create(toCSSPrimitiveValue(filterValue.item(i)).computeDegrees()));
break;
case CSSValueBlur:
- result->set(i, LengthStyleInterpolation::toInterpolableValue(*filterValue.item(i), CSSPropertyWebkitFilter));
+ result->set(i, LengthStyleInterpolation::toInterpolableValue(filterValue.item(i), CSSPropertyWebkitFilter));
break;
case CSSValueGrayscale:
case CSSValueInvert:
@@ -119,7 +119,7 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> FilterStyleInterpolation::toInterpolab
case CSSValueContrast:
case CSSValueOpacity:
case CSSValueSaturate:
- result->set(i, InterpolableNumber::create(toCSSPrimitiveValue(filterValue.item(i))->getDoubleValue()));
+ result->set(i, InterpolableNumber::create(toCSSPrimitiveValue(filterValue.item(i)).getDoubleValue()));
break;
case CSSValueDropShadow:
case CSSValueUrl:
« no previous file with comments | « Source/core/animation/DoubleStyleInterpolationTest.cpp ('k') | Source/core/animation/FilterStyleInterpolationTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698