Chromium Code Reviews| Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp |
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
| index d2dc079832ab80e13c70b6f5c9a3e425064d0907..4e17c26398e2d18279ab33c47a9d029a85be56c2 100644 |
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
| @@ -989,6 +989,7 @@ static bool hasPropertyThatCreatesStackingContext(const Vector<CSSPropertyID>& p |
| case CSSPropertyPosition: |
| case CSSPropertyMixBlendMode: |
| case CSSPropertyIsolation: |
| + case CSSPropertyOffsetPath: |
|
suzyh_UTC10 (ex-contributor)
2016/09/19 01:21:04
Is this introducing a behaviour change?
Eric Willigers
2016/09/19 01:54:40
Bug fix, can move to a separate CL.
https://draft
|
| return true; |
| default: |
| break; |
| @@ -1098,7 +1099,7 @@ void ComputedStyle::applyTransform(TransformationMatrix& result, const LayoutSiz |
| void ComputedStyle::applyTransform(TransformationMatrix& result, const FloatRect& boundingBox, ApplyTransformOrigin applyOrigin, ApplyMotionPath applyMotionPath, ApplyIndependentTransformProperties applyIndependentTransformProperties) const |
| { |
| - if (!hasMotionPath()) |
| + if (!hasOffsetPath()) |
| applyMotionPath = ExcludeMotionPath; |
| bool applyTransformOrigin = requireTransformOrigin(applyOrigin, applyMotionPath); |
| @@ -1146,7 +1147,7 @@ void ComputedStyle::applyMotionPathTransform(float originX, float originY, Trans |
| ASSERT(motionData.m_path); |
| const StylePath& motionPath = *motionData.m_path; |
| float pathLength = motionPath.length(); |
| - float distance = floatValueForLength(motionData.m_offset, pathLength); |
| + float distance = floatValueForLength(motionData.m_distance, pathLength); |
| float computedDistance; |
| if (motionPath.isClosed() && pathLength > 0) { |
| computedDistance = fmod(distance, pathLength); |
| @@ -1160,7 +1161,7 @@ void ComputedStyle::applyMotionPathTransform(float originX, float originY, Trans |
| float angle; |
| motionPath.path().pointAndNormalAtLength(computedDistance, point, angle); |
| - if (motionData.m_rotation.type == MotionRotationFixed) |
| + if (motionData.m_rotation.type == OffsetRotationFixed) |
| angle = 0; |
| transform.translate(point.x() - originX, point.y() - originY); |
| @@ -1856,7 +1857,7 @@ void ComputedStyle::setMarginEnd(const Length& margin) |
| } |
| } |
| -void ComputedStyle::setMotionPath(PassRefPtr<StylePath> path) |
| +void ComputedStyle::setOffsetPath(PassRefPtr<StylePath> path) |
| { |
| m_rareNonInheritedData.access()->m_transform.access()->m_motion.m_path = path; |
| } |