| Index: Source/core/css/resolver/AnimatedStyleBuilder.cpp
|
| diff --git a/Source/core/css/resolver/AnimatedStyleBuilder.cpp b/Source/core/css/resolver/AnimatedStyleBuilder.cpp
|
| index 368b6a19042e984686036979d39c1df91f3f889b..776946880ed245c14328a35c99bddc7b6fa869c6 100644
|
| --- a/Source/core/css/resolver/AnimatedStyleBuilder.cpp
|
| +++ b/Source/core/css/resolver/AnimatedStyleBuilder.cpp
|
| @@ -174,7 +174,7 @@ void setOnFillLayers(FillLayer* fillLayer, const AnimatableValue* value, StyleRe
|
| case CSSPropertyBackgroundImage:
|
| case CSSPropertyWebkitMaskImage:
|
| if (layerValue->isImage()) {
|
| - fillLayer->setImage(toAnimatableImage(layerValue)->toStyleImage());
|
| + fillLayer->setImage(state.styleImage(property, toAnimatableImage(layerValue)->toCSSValue()));
|
| } else {
|
| ASSERT(toAnimatableUnknown(layerValue)->toCSSValueID() == CSSValueNone);
|
| fillLayer->setImage(nullptr);
|
| @@ -297,7 +297,7 @@ void AnimatedStyleBuilder::applyProperty(CSSPropertyID property, StyleResolverSt
|
| style->setBorderImageSlices(animatableValueToLengthBox(value, state, NonNegativeValues));
|
| return;
|
| case CSSPropertyBorderImageSource:
|
| - style->setBorderImageSource(toAnimatableImage(value)->toStyleImage());
|
| + style->setBorderImageSource(state.styleImage(property, toAnimatableImage(value)->toCSSValue()));
|
| return;
|
| case CSSPropertyBorderImageWidth:
|
| style->setBorderImageWidth(animatableValueToBorderImageLengthBox(value, state));
|
| @@ -393,7 +393,7 @@ void AnimatedStyleBuilder::applyProperty(CSSPropertyID property, StyleResolverSt
|
| style->setLineHeight(Length(clampTo<float>(toAnimatableDouble(value)->toDouble(), 0), Percent));
|
| return;
|
| case CSSPropertyListStyleImage:
|
| - style->setListStyleImage(toAnimatableImage(value)->toStyleImage());
|
| + style->setListStyleImage(state.styleImage(property, toAnimatableImage(value)->toCSSValue()));
|
| return;
|
| case CSSPropertyLetterSpacing:
|
| style->setLetterSpacing(clampTo<float>(toAnimatableDouble(value)->toDouble()));
|
| @@ -536,7 +536,7 @@ void AnimatedStyleBuilder::applyProperty(CSSPropertyID property, StyleResolverSt
|
| style->setMaskBoxImageSlicesFill(toAnimatableLengthBoxAndBool(value)->flag());
|
| return;
|
| case CSSPropertyWebkitMaskBoxImageSource:
|
| - style->setMaskBoxImageSource(toAnimatableImage(value)->toStyleImage());
|
| + style->setMaskBoxImageSource(state.styleImage(property, toAnimatableImage(value)->toCSSValue()));
|
| return;
|
| case CSSPropertyWebkitMaskBoxImageWidth:
|
| style->setMaskBoxImageWidth(animatableValueToBorderImageLengthBox(value, state));
|
|
|