| Index: Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
|
| index 6126f704eb577fe785d9340ae24832bb01b0149d..6b6b7c5e749d889f57bed3d11e1dfbaf05be0cd5 100644
|
| --- a/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -671,17 +671,17 @@ PassRefPtr<ComputedStyle> StyleResolver::styleForKeyframe(Element& element, cons
|
|
|
| // 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, const ComputedStyle* baseStyle, CSSPropertyID property, CSSValue* value)
|
| +PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(Element& element, const ComputedStyle* baseStyle, CSSPropertyID property, NullableCSSValue value)
|
| {
|
| StyleResolverState state(element.document(), &element);
|
| state.setStyle(baseStyle ? ComputedStyle::clone(*baseStyle) : ComputedStyle::create());
|
| return createAnimatableValueSnapshot(state, property, value);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(StyleResolverState& state, CSSPropertyID property, CSSValue* value)
|
| +PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(StyleResolverState& state, CSSPropertyID property, NullableCSSValue value)
|
| {
|
| if (value) {
|
| - StyleBuilder::applyProperty(property, state, value);
|
| + StyleBuilder::applyProperty(property, state, *value);
|
| state.fontBuilder().createFont(state.document().styleEngine().fontSelector(), state.mutableStyleRef());
|
| }
|
| return CSSAnimatableValueFactory::create(property, *state.style());
|
| @@ -1185,7 +1185,7 @@ static bool shouldIgnoreTextTrackAuthorStyle(Document& document)
|
| // This method expands the 'all' shorthand property to longhand properties
|
| // and applies the expanded longhand properties.
|
| template <CSSPropertyPriority priority>
|
| -void StyleResolver::applyAllProperty(StyleResolverState& state, CSSValue* allValue, bool inheritedOnly)
|
| +void StyleResolver::applyAllProperty(StyleResolverState& state, CSSValue allValue, bool inheritedOnly)
|
| {
|
| unsigned startCSSProperty = CSSPropertyPriorityData<priority>::first();
|
| unsigned endCSSProperty = CSSPropertyPriorityData<priority>::last();
|
| @@ -1240,7 +1240,7 @@ void StyleResolver::applyProperties(StyleResolverState& state, const StyleProper
|
| // If the property value is explicitly inherited, we need to apply further non-inherited properties
|
| // as they might override the value inherited here. For this reason we don't allow declarations with
|
| // explicitly inherited properties to be cached.
|
| - ASSERT(!current.value()->isInheritedValue());
|
| + ASSERT(!current.value().isInheritedValue());
|
| continue;
|
| }
|
|
|
| @@ -1434,7 +1434,7 @@ void StyleResolver::computeFont(ComputedStyle* style, const StylePropertySet& pr
|
| for (CSSPropertyID property : properties) {
|
| if (property == CSSPropertyLineHeight)
|
| updateFont(state);
|
| - StyleBuilder::applyProperty(property, state, propertySet.getPropertyCSSValue(property).get());
|
| + StyleBuilder::applyProperty(property, state, *propertySet.getPropertyCSSValue(property));
|
| }
|
| }
|
|
|
|
|