Chromium Code Reviews| Index: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp |
| diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp |
| index ecbb928c555ecdb76cbd89b3e472ee2c5bd100c1..71e98f9bb75fbfe954921c7f1470143a94f0a7d5 100644 |
| --- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp |
| +++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp |
| @@ -2730,19 +2730,22 @@ const CSSValue* ComputedStyleCSSValueMapping::get(CSSPropertyID propertyID, cons |
| case CSSPropertyMotion: |
| return valuesForShorthandProperty(motionShorthand(), style, layoutObject, styledNode, allowVisitedStyle); |
| - case CSSPropertyMotionPath: |
| - if (const StylePath* styleMotionPath = style.motionPath()) |
| + case CSSPropertyOffset: |
| + return valuesForShorthandProperty(offsetShorthand(), style, layoutObject, styledNode, allowVisitedStyle); |
| + |
| + case CSSPropertyOffsetPath: |
| + if (const StylePath* styleMotionPath = style.offsetPath()) |
| return styleMotionPath->computedCSSValue(); |
| return CSSPrimitiveValue::createIdentifier(CSSValueNone); |
| - case CSSPropertyMotionOffset: |
| - return zoomAdjustedPixelValueForLength(style.motionOffset(), style); |
| + case CSSPropertyOffsetDistance: |
| + return zoomAdjustedPixelValueForLength(style.offsetDistance(), style); |
| - case CSSPropertyMotionRotation: { |
| + case CSSPropertyOffsetRotation: { |
| CSSValueList* list = CSSValueList::createSpaceSeparated(); |
| - if (style.motionRotation().type == MotionRotationAuto) |
| + if (style.offsetRotation().type == OffsetRotationAuto) |
| list->append(*CSSPrimitiveValue::createIdentifier(CSSValueAuto)); |
| - list->append(*CSSPrimitiveValue::create(style.motionRotation().angle, CSSPrimitiveValue::UnitType::Degrees)); |
| + list->append(*CSSPrimitiveValue::create(style.offsetRotation().angle, CSSPrimitiveValue::UnitType::Degrees)); |
| return list; |
| } |
| @@ -3023,3 +3026,4 @@ const CSSValue* ComputedStyleCSSValueMapping::get(CSSPropertyID propertyID, cons |
| } |
| } // namespace blink |
| + |
|
alancutter (OOO until 2018)
2016/09/19 00:49:54
No need for extra newline.
Eric Willigers
2016/09/19 01:54:40
Done.
|