wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 952977: Convert DrawTo to gfx::Matrix4x4 r=nical

Browse Source
This commit is contained in:
David Zbarsky 2014-01-27 15:25:20 -05:00
parent 0bbd7b8bd8
commit 8c0287eca2
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/layers/RotatedBuffer.cpp
View File

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

2
gfx/layers/RotatedBuffer.h
View File

@ -292,7 +292,7 @@ public:
float aOpacity,
gfx::CompositionOp aOp,
gfxASurface* aMask,
const gfxMatrix* aMaskTransform);
const gfx::Matrix* aMaskTransform);
protected:
TemporaryRef<gfx::DrawTarget>

8
gfx/layers/basic/BasicThebesLayer.cpp
View File

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

3
gfx/layers/client/ContentClient.h
View File

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