Chromium Code Reviews| Index: Source/core/css/resolver/StyleResolver.cpp |
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp |
| index 67a7eb1662c837d93419ca41b0a44c690b868be1..9878f21af0ef2732cc3142665bc8aa5f5714481d 100644 |
| --- a/Source/core/css/resolver/StyleResolver.cpp |
| +++ b/Source/core/css/resolver/StyleResolver.cpp |
| @@ -752,15 +752,23 @@ PassRefPtr<RenderStyle> StyleResolver::styleForKeyframe(Element* element, const |
| // This function is used by the WebAnimations JavaScript API method animate(). |
| // FIXME: Remove this when animate() switches away from resolution-dependent parsing. |
| -PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(Element& element, CSSPropertyID property, CSSValue* value) |
| +PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(Element& element, CSSPropertyID property, CSSValue& value) |
| +{ |
| + RefPtr<RenderStyle> style; |
| + if (element.renderStyle()) |
|
dstockwell
2014/05/26 11:20:40
Do we ever need to use the element's render style
|
| + style = RenderStyle::clone(element.renderStyle()); |
| + else |
| + style = RenderStyle::create(); |
| + return createAnimatableValueSnapshot(element, property, value, *style); |
| +} |
| + |
| +PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(Element& element, CSSPropertyID property, CSSValue& value, RenderStyle& style) |
| { |
| - // We use a fresh RenderStyle here because certain values (eg. background-position) won't always completely replace the previously applied property. |
| - RefPtr<RenderStyle> style = element.renderStyle() ? RenderStyle::clone(element.renderStyle()) : RenderStyle::create(); |
| StyleResolverState state(element.document(), &element); |
| - state.setStyle(style.get()); |
| + state.setStyle(&style); |
| state.fontBuilder().initForStyleResolve(state.document(), state.style(), state.useSVGZoomRules()); |
| - StyleBuilder::applyProperty(property, state, value); |
| - return CSSAnimatableValueFactory::create(property, *style); |
| + StyleBuilder::applyProperty(property, state, &value); |
| + return CSSAnimatableValueFactory::create(property, style); |
| } |
| PassRefPtrWillBeRawPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded(Element& parent, PseudoId pseudoId) |