diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index 0cbfa23092d8..d83b537616e1 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -4037,7 +4037,7 @@ nsDisplayTransform::FrameTransformProperties::FrameTransformProperties(const nsI const nsRect* aBoundsOverride) : mFrame(aFrame) , mTransformList(aFrame->StyleDisplay()->mSpecifiedTransform) - , mToMozOrigin(GetDeltaToMozTransformOrigin(aFrame, aAppUnitsPerPixel, aBoundsOverride)) + , mToTransformOrigin(GetDeltaToMozTransformOrigin(aFrame, aAppUnitsPerPixel, aBoundsOverride)) , mToPerspectiveOrigin(GetDeltaToMozPerspectiveOrigin(aFrame, aAppUnitsPerPixel)) , mChildPerspective(0) { @@ -4147,7 +4147,7 @@ nsDisplayTransform::GetResultingTransformMatrixInternal(const FrameTransformProp /* At the point when perspective is applied, we have been translated to the transform origin. * The translation to the perspective origin is the difference between these values. */ - result = result * nsLayoutUtils::ChangeMatrixBasis(aProperties.mToPerspectiveOrigin - aProperties.mToMozOrigin, perspective); + result = result * nsLayoutUtils::ChangeMatrixBasis(aProperties.mToPerspectiveOrigin - aProperties.mToTransformOrigin, perspective); } gfxPoint3D rounded(hasSVGTransforms ? newOrigin.x : NS_round(newOrigin.x), @@ -4167,11 +4167,11 @@ nsDisplayTransform::GetResultingTransformMatrixInternal(const FrameTransformProp GetResultingTransformMatrixInternal(props, aOrigin - frame->GetPosition(), aAppUnitsPerPixel, nullptr, aOutAncestor); - return nsLayoutUtils::ChangeMatrixBasis(rounded + aProperties.mToMozOrigin, result) * parent; + return nsLayoutUtils::ChangeMatrixBasis(rounded + aProperties.mToTransformOrigin, result) * parent; } return nsLayoutUtils::ChangeMatrixBasis - (rounded + aProperties.mToMozOrigin, result); + (rounded + aProperties.mToTransformOrigin, result); } bool diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h index cc3cb2d93898..67e875e994fa 100644 --- a/layout/base/nsDisplayList.h +++ b/layout/base/nsDisplayList.h @@ -3036,19 +3036,19 @@ public: float aAppUnitsPerPixel, const nsRect* aBoundsOverride); FrameTransformProperties(const nsCSSValueList* aTransformList, - const gfxPoint3D& aToMozOrigin, + const gfxPoint3D& aToTransformOrigin, const gfxPoint3D& aToPerspectiveOrigin, nscoord aChildPerspective) : mFrame(nullptr) , mTransformList(aTransformList) - , mToMozOrigin(aToMozOrigin) + , mToTransformOrigin(aToTransformOrigin) , mToPerspectiveOrigin(aToPerspectiveOrigin) , mChildPerspective(aChildPerspective) {} const nsIFrame* mFrame; const nsCSSValueList* mTransformList; - const gfxPoint3D mToMozOrigin; + const gfxPoint3D mToTransformOrigin; const gfxPoint3D mToPerspectiveOrigin; nscoord mChildPerspective; };