зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1274962 - Part 3: Remove aOutAncestor. r=mstange
This commit is contained in:
Родитель
78823780e7
Коммит
a3ac199d7f
|
@ -5625,11 +5625,10 @@ nsDisplayTransform::GetResultingTransformMatrix(const FrameTransformProperties&
|
|||
const nsPoint& aOrigin,
|
||||
float aAppUnitsPerPixel,
|
||||
uint32_t aFlags,
|
||||
const nsRect* aBoundsOverride,
|
||||
nsIFrame** aOutAncestor)
|
||||
const nsRect* aBoundsOverride)
|
||||
{
|
||||
return GetResultingTransformMatrixInternal(aProperties, aOrigin, aAppUnitsPerPixel,
|
||||
aFlags, aBoundsOverride, aOutAncestor);
|
||||
aFlags, aBoundsOverride);
|
||||
}
|
||||
|
||||
Matrix4x4
|
||||
|
@ -5637,15 +5636,14 @@ nsDisplayTransform::GetResultingTransformMatrix(const nsIFrame* aFrame,
|
|||
const nsPoint& aOrigin,
|
||||
float aAppUnitsPerPixel,
|
||||
uint32_t aFlags,
|
||||
const nsRect* aBoundsOverride,
|
||||
nsIFrame** aOutAncestor)
|
||||
const nsRect* aBoundsOverride)
|
||||
{
|
||||
FrameTransformProperties props(aFrame,
|
||||
aAppUnitsPerPixel,
|
||||
aBoundsOverride);
|
||||
|
||||
return GetResultingTransformMatrixInternal(props, aOrigin, aAppUnitsPerPixel,
|
||||
aFlags, aBoundsOverride, aOutAncestor);
|
||||
aFlags, aBoundsOverride);
|
||||
}
|
||||
|
||||
Matrix4x4
|
||||
|
@ -5653,18 +5651,13 @@ nsDisplayTransform::GetResultingTransformMatrixInternal(const FrameTransformProp
|
|||
const nsPoint& aOrigin,
|
||||
float aAppUnitsPerPixel,
|
||||
uint32_t aFlags,
|
||||
const nsRect* aBoundsOverride,
|
||||
nsIFrame** aOutAncestor)
|
||||
const nsRect* aBoundsOverride)
|
||||
{
|
||||
const nsIFrame *frame = aProperties.mFrame;
|
||||
NS_ASSERTION(frame || !(aFlags & INCLUDE_PERSPECTIVE), "Must have a frame to compute perspective!");
|
||||
MOZ_ASSERT((aFlags & (OFFSET_BY_ORIGIN|BASIS_AT_ORIGIN)) != (OFFSET_BY_ORIGIN|BASIS_AT_ORIGIN),
|
||||
"Can't specify offset by origin as well as basis at origin!");
|
||||
|
||||
if (aOutAncestor) {
|
||||
*aOutAncestor = nsLayoutUtils::GetCrossDocParentFrame(frame);
|
||||
}
|
||||
|
||||
// Get the underlying transform matrix:
|
||||
|
||||
// We don't use aBoundsOverride for SVG since we need to account for
|
||||
|
@ -5789,7 +5782,7 @@ nsDisplayTransform::GetResultingTransformMatrixInternal(const FrameTransformProp
|
|||
GetResultingTransformMatrixInternal(props,
|
||||
aOrigin - frame->GetPosition(),
|
||||
aAppUnitsPerPixel, flags,
|
||||
nullptr, aOutAncestor);
|
||||
nullptr);
|
||||
result = result * parent;
|
||||
}
|
||||
|
||||
|
|
|
@ -4093,14 +4093,12 @@ public:
|
|||
const nsPoint& aOrigin,
|
||||
float aAppUnitsPerPixel,
|
||||
uint32_t aFlags,
|
||||
const nsRect* aBoundsOverride = nullptr,
|
||||
nsIFrame** aOutAncestor = nullptr);
|
||||
const nsRect* aBoundsOverride = nullptr);
|
||||
static Matrix4x4 GetResultingTransformMatrix(const FrameTransformProperties& aProperties,
|
||||
const nsPoint& aOrigin,
|
||||
float aAppUnitsPerPixel,
|
||||
uint32_t aFlags,
|
||||
const nsRect* aBoundsOverride = nullptr,
|
||||
nsIFrame** aOutAncestor = nullptr);
|
||||
const nsRect* aBoundsOverride = nullptr);
|
||||
/**
|
||||
* Return true when we should try to prerender the entire contents of the
|
||||
* transformed frame even when it's not completely visible (yet).
|
||||
|
@ -4180,8 +4178,7 @@ private:
|
|||
const nsPoint& aOrigin,
|
||||
float aAppUnitsPerPixel,
|
||||
uint32_t aFlags,
|
||||
const nsRect* aBoundsOverride,
|
||||
nsIFrame** aOutAncestor);
|
||||
const nsRect* aBoundsOverride);
|
||||
|
||||
StoreList mStoredList;
|
||||
Matrix4x4 mTransform;
|
||||
|
|
|
@ -5358,7 +5358,8 @@ nsIFrame::GetTransformMatrix(const nsIFrame* aStopAtAncestor,
|
|||
Matrix4x4 result = nsDisplayTransform::GetResultingTransformMatrix(this,
|
||||
nsPoint(0,0), scaleFactor,
|
||||
nsDisplayTransform::INCLUDE_PERSPECTIVE|nsDisplayTransform::OFFSET_BY_ORIGIN,
|
||||
nullptr, aOutAncestor);
|
||||
nullptr);
|
||||
*aOutAncestor = nsLayoutUtils::GetCrossDocParentFrame(this);
|
||||
nsPoint delta = GetOffsetToCrossDoc(*aOutAncestor);
|
||||
/* Combine the raw transform with a translation to our parent. */
|
||||
result.PostTranslate(NSAppUnitsToFloatPixels(delta.x, scaleFactor),
|
||||
|
|
Загрузка…
Ссылка в новой задаче