Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 929673 Patch 2: Rename mToMozOrigin to mToTransformOrigin to avoid use of deprecated CSS prefixes in variable names. r=dzbarsky

Browse Source
This commit is contained in:
L. David Baron 2013-10-24 14:46:00 +02:00
parent 340c09d983
commit 9b57c9876e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/base/nsDisplayList.cpp
View File

@ -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

6
layout/base/nsDisplayList.h
View File

@ -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;
};