mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 11:55:49 +00:00
Bug 952977: Convert DrawTo to gfx::Matrix4x4 r=nical
This commit is contained in:
parent
c3de69e906
commit
f64de7bed1
@ -188,7 +188,7 @@ RotatedContentBuffer::DrawTo(ThebesLayer* aLayer,
|
||||
float aOpacity,
|
||||
CompositionOp aOp,
|
||||
gfxASurface* aMask,
|
||||
const gfxMatrix* aMaskTransform)
|
||||
const Matrix* aMaskTransform)
|
||||
{
|
||||
if (!EnsureBuffer()) {
|
||||
return;
|
||||
@ -220,7 +220,7 @@ RotatedContentBuffer::DrawTo(ThebesLayer* aLayer,
|
||||
|
||||
Matrix maskTransform;
|
||||
if (aMaskTransform) {
|
||||
maskTransform = ToMatrix(*aMaskTransform);
|
||||
maskTransform = *aMaskTransform;
|
||||
}
|
||||
|
||||
DrawBufferWithRotation(aTarget, BUFFER_BLACK, aOpacity, aOp, mask, &maskTransform);
|
||||
|
@ -292,7 +292,7 @@ public:
|
||||
float aOpacity,
|
||||
gfx::CompositionOp aOp,
|
||||
gfxASurface* aMask,
|
||||
const gfxMatrix* aMaskTransform);
|
||||
const gfx::Matrix* aMaskTransform);
|
||||
|
||||
protected:
|
||||
TemporaryRef<gfx::DrawTarget>
|
||||
|
@ -126,16 +126,16 @@ BasicThebesLayer::PaintThebes(gfxContext* aContext,
|
||||
// is internal to basic layers
|
||||
AutoMaskData mask;
|
||||
gfxASurface* maskSurface = nullptr;
|
||||
const gfxMatrix* maskTransform = nullptr;
|
||||
Matrix maskTransform;
|
||||
if (GetMaskData(aMaskLayer, &mask)) {
|
||||
maskSurface = mask.GetSurface();
|
||||
maskTransform = &mask.GetTransform();
|
||||
maskTransform = ToMatrix(mask.GetTransform());
|
||||
}
|
||||
|
||||
if (!IsHidden() && !clipExtents.IsEmpty()) {
|
||||
mContentClient->DrawTo(this, aContext->GetDrawTarget(), opacity,
|
||||
CompositionOpForOp(GetOperator()),
|
||||
maskSurface, maskTransform);
|
||||
maskSurface, &maskTransform);
|
||||
}
|
||||
|
||||
for (uint32_t i = 0; i < readbackUpdates.Length(); ++i) {
|
||||
@ -149,7 +149,7 @@ BasicThebesLayer::PaintThebes(gfxContext* aContext,
|
||||
ctx->Translate(gfxPoint(offset.x, offset.y));
|
||||
mContentClient->DrawTo(this, ctx->GetDrawTarget(), 1.0,
|
||||
CompositionOpForOp(ctx->CurrentOperator()),
|
||||
maskSurface, maskTransform);
|
||||
maskSurface, &maskTransform);
|
||||
update.mLayer->GetSink()->EndUpdate(ctx, update.mUpdateRect + offset);
|
||||
}
|
||||
}
|
||||
|
@ -28,7 +28,6 @@
|
||||
#include "nsTArray.h" // for nsTArray
|
||||
|
||||
class gfxContext;
|
||||
struct gfxMatrix;
|
||||
class gfxASurface;
|
||||
|
||||
namespace mozilla {
|
||||
@ -158,7 +157,7 @@ public:
|
||||
float aOpacity,
|
||||
gfx::CompositionOp aOp,
|
||||
gfxASurface* aMask,
|
||||
const gfxMatrix* aMaskTransform)
|
||||
const gfx::Matrix* aMaskTransform)
|
||||
{
|
||||
RotatedContentBuffer::DrawTo(aLayer, aTarget, aOpacity, aOp,
|
||||
aMask, aMaskTransform);
|
||||
|
Loading…
Reference in New Issue
Block a user