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 1201937 - push transform onto cairo context when evaluating path bounds. r=eihrul

Browse Source
This commit is contained in:
Lee Salzman 2015-09-21 13:33:06 -04:00
parent 22fcc57f38
commit 83e5c49f4c
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/2d/Matrix.h
View File

@ -265,6 +265,13 @@ public:
return !(*this == other);
}
bool ExactlyEquals(const Matrix& o) const
{
return _11 == o._11 && _12 == o._12 &&
_21 == o._21 && _22 == o._22 &&
_31 == o._31 && _32 == o._32;
}
/* Verifies that the matrix contains no Infs or NaNs. */
bool IsFinite() const
{

22
gfx/2d/PathCairo.cpp
View File

@ -188,7 +188,7 @@ PathCairo::ContainsPoint(const Point &aPoint, const Matrix &aTransform) const
inverse.Invert();
Point transformed = inverse * aPoint;
EnsureContainingContext();
EnsureContainingContext(aTransform);
return cairo_in_fill(mContainingContext, transformed.x, transformed.y);
}
@ -202,7 +202,7 @@ PathCairo::StrokeContainsPoint(const StrokeOptions &aStrokeOptions,
inverse.Invert();
Point transformed = inverse * aPoint;
EnsureContainingContext();
EnsureContainingContext(aTransform);
SetCairoStrokeOptions(mContainingContext, aStrokeOptions);
@ -212,7 +212,7 @@ PathCairo::StrokeContainsPoint(const StrokeOptions &aStrokeOptions,
Rect
PathCairo::GetBounds(const Matrix &aTransform) const
{
EnsureContainingContext();
EnsureContainingContext(aTransform);
double x1, y1, x2, y2;
@ -225,7 +225,7 @@ Rect
PathCairo::GetStrokedBounds(const StrokeOptions &aStrokeOptions,
const Matrix &aTransform) const
{
EnsureContainingContext();
EnsureContainingContext(aTransform);
double x1, y1, x2, y2;
@ -266,13 +266,21 @@ PathCairo::StreamToSink(PathSink *aSink) const
}
void
PathCairo::EnsureContainingContext() const
PathCairo::EnsureContainingContext(const Matrix &aTransform) const
{
if (mContainingContext) {
return;
if (mContainingTransform.ExactlyEquals(aTransform)) {
return;
}
} else {
mContainingContext = cairo_create(DrawTargetCairo::GetDummySurface());
}
mContainingContext = cairo_create(DrawTargetCairo::GetDummySurface());
mContainingTransform = aTransform;
cairo_matrix_t mat;
GfxMatrixToCairoMatrix(mContainingTransform, mat);
cairo_set_matrix(mContainingContext, &mat);
SetPathOnContext(mContainingContext);
}

3
gfx/2d/PathCairo.h
View File

@ -80,11 +80,12 @@ public:
void AppendPathToBuilder(PathBuilderCairo *aBuilder, const Matrix *aTransform = nullptr) const;
private:
void EnsureContainingContext() const;
void EnsureContainingContext(const Matrix &aTransform) const;
FillRule mFillRule;
std::vector<cairo_path_data_t> mPathData;
mutable cairo_t *mContainingContext;
mutable Matrix mContainingTransform;
Point mCurrentPoint;
};