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 1054838, part 3 - Convert gfxPattern to Moz2D. r=Bas

Browse Source
This commit is contained in:
Matt Woodrow 2014-09-14 10:58:56 +01:00
parent f46ede4015
commit 11f07a34b1
3 changed files with 117 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/thebes/gfx2DGlue.h
View File

@ -120,6 +120,21 @@ inline ExtendMode ToExtendMode(gfxPattern::GraphicsExtend aExtend)
}
}
inline gfxPattern::GraphicsPatternType
ThebesPatternType(PatternType aType)
{
switch (aType) {
case PatternType::SURFACE:
return gfxPattern::PATTERN_SURFACE;
case PatternType::LINEAR_GRADIENT:
return gfxPattern::PATTERN_LINEAR;
case PatternType::RADIAL_GRADIENT:
return gfxPattern::PATTERN_RADIAL;
default:
return gfxPattern::PATTERN_SOLID;
}
}
inline gfxPattern::GraphicsExtend ThebesExtend(ExtendMode aExtend)
{
switch (aExtend) {

328
gfx/thebes/gfxPattern.cpp
View File

@ -9,6 +9,7 @@
#include "gfxPlatform.h"
#include "gfx2DGlue.h"
#include "gfxGradientCache.h"
#include "mozilla/gfx/2D.h"
#include "cairo.h"
@ -17,66 +18,72 @@
using namespace mozilla::gfx;
gfxPattern::gfxPattern(const gfxRGBA& aColor)
: mGfxPattern(nullptr)
: mExtend(EXTEND_NONE)
{
mPattern = cairo_pattern_create_rgba(aColor.r, aColor.g, aColor.b, aColor.a);
mGfxPattern =
new (mColorPattern.addr()) ColorPattern(Color(aColor.r, aColor.g, aColor.b, aColor.a));
}
// linear
gfxPattern::gfxPattern(gfxFloat x0, gfxFloat y0, gfxFloat x1, gfxFloat y1)
: mGfxPattern(nullptr)
: mExtend(EXTEND_NONE)
{
mPattern = cairo_pattern_create_linear(x0, y0, x1, y1);
mGfxPattern =
new (mLinearGradientPattern.addr()) LinearGradientPattern(Point(x0, y0),
Point(x1, y1),
nullptr);
}
// radial
gfxPattern::gfxPattern(gfxFloat cx0, gfxFloat cy0, gfxFloat radius0,
gfxFloat cx1, gfxFloat cy1, gfxFloat radius1)
: mGfxPattern(nullptr)
: mExtend(EXTEND_NONE)
{
mPattern = cairo_pattern_create_radial(cx0, cy0, radius0,
cx1, cy1, radius1);
mGfxPattern =
new (mRadialGradientPattern.addr()) RadialGradientPattern(Point(cx0, cy0),
Point(cx1, cy1),
radius0, radius1,
nullptr);
}
// Azure
gfxPattern::gfxPattern(SourceSurface *aSurface, const Matrix &aTransform)
: mPattern(nullptr)
, mGfxPattern(nullptr)
, mSourceSurface(aSurface)
, mTransform(aTransform)
: mTransform(aTransform)
, mExtend(EXTEND_NONE)
, mFilter(mozilla::gfx::Filter::GOOD)
{
mGfxPattern = new (mSurfacePattern.addr())
SurfacePattern(aSurface, ToExtendMode(mExtend), aTransform,
mozilla::gfx::Filter::GOOD);
}
gfxPattern::~gfxPattern()
{
cairo_pattern_destroy(mPattern);
if (mGfxPattern) {
mGfxPattern->~Pattern();
}
if (mGfxPattern) {
mGfxPattern->~Pattern();
}
}
void
gfxPattern::AddColorStop(gfxFloat offset, const gfxRGBA& c)
{
if (mPattern) {
mStops = nullptr;
if (gfxPlatform::GetCMSMode() == eCMSMode_All) {
gfxRGBA cms;
qcms_transform *transform = gfxPlatform::GetCMSRGBTransform();
if (transform)
gfxPlatform::TransformPixel(c, cms, transform);
// Use the original alpha to avoid unnecessary float->byte->float
// conversion errors
cairo_pattern_add_color_stop_rgba(mPattern, offset,
cms.r, cms.g, cms.b, c.a);
}
else
cairo_pattern_add_color_stop_rgba(mPattern, offset, c.r, c.g, c.b, c.a);
if (mGfxPattern->GetType() != PatternType::LINEAR_GRADIENT &&
mGfxPattern->GetType() != PatternType::RADIAL_GRADIENT) {
return;
}
mStops = nullptr;
gfxRGBA color = c;
if (gfxPlatform::GetCMSMode() == eCMSMode_All) {
qcms_transform *transform = gfxPlatform::GetCMSRGBTransform();
if (transform) {
gfxPlatform::TransformPixel(color, color, transform);
}
}
GradientStop stop;
stop.offset = offset;
stop.color = ToColor(color);
mStopsList.AppendElement(stop);
}
void
@ -88,210 +95,92 @@ gfxPattern::SetColorStops(GradientStops* aStops)
void
gfxPattern::CacheColorStops(DrawTarget *aDT)
{
if (mPattern) {
mStops = nullptr;
nsTArray<GradientStop> stops;
int count = 0;
cairo_pattern_get_color_stop_count(mPattern, &count);
stops.SetLength(count);
for (int n = 0; n < count; ++n) {
double offset, r, g, b, a;
cairo_pattern_get_color_stop_rgba(mPattern, n, &offset, &r, &g, &b, &a);
stops[n].color = Color(r, g, b, a);
stops[n].offset = offset;
}
GraphicsExtend extend = GraphicsExtend(cairo_pattern_get_extend(mPattern));
mStops = gfxGradientCache::GetOrCreateGradientStops(aDT, stops,
ToExtendMode(extend));
}
mStops = gfxGradientCache::GetOrCreateGradientStops(aDT, mStopsList,
ToExtendMode(mExtend));
}
void
gfxPattern::SetMatrix(const gfxMatrix& matrix)
{
if (mPattern) {
cairo_matrix_t mat = *reinterpret_cast<const cairo_matrix_t*>(&matrix);
cairo_pattern_set_matrix(mPattern, &mat);
} else {
mTransform = ToMatrix(matrix);
// Cairo-pattern matrices specify the conversion from DrawTarget to pattern
// space. Azure pattern matrices specify the conversion from pattern to
// DrawTarget space.
mTransform.Invert();
}
mTransform = ToMatrix(matrix);
// Cairo-pattern matrices specify the conversion from DrawTarget to pattern
// space. Azure pattern matrices specify the conversion from pattern to
// DrawTarget space.
mTransform.Invert();
}
gfxMatrix
gfxPattern::GetMatrix() const
{
if (mPattern) {
cairo_matrix_t mat;
cairo_pattern_get_matrix(mPattern, &mat);
return gfxMatrix(*reinterpret_cast<gfxMatrix*>(&mat));
} else {
// invert at the higher precision of gfxMatrix
// cause we need to convert at some point anyways
gfxMatrix mat = ThebesMatrix(mTransform);
mat.Invert();
return mat;
}
// invert at the higher precision of gfxMatrix
// cause we need to convert at some point anyways
gfxMatrix mat = ThebesMatrix(mTransform);
mat.Invert();
return mat;
}
gfxMatrix
gfxPattern::GetInverseMatrix() const
{
if (mPattern) {
cairo_matrix_t mat;
cairo_pattern_get_matrix(mPattern, &mat);
cairo_matrix_invert(&mat);
return gfxMatrix(*reinterpret_cast<gfxMatrix*>(&mat));
} else {
return ThebesMatrix(mTransform);
}
return ThebesMatrix(mTransform);
}
Pattern*
gfxPattern::GetPattern(DrawTarget *aTarget, Matrix *aPatternTransform)
{
if (mGfxPattern) {
mGfxPattern->~Pattern();
mGfxPattern = nullptr;
if (!mStops &&
!mStopsList.IsEmpty()) {
mStops = aTarget->CreateGradientStops(mStopsList.Elements(),
mStopsList.Length(),
ToExtendMode(mExtend));
}
if (!mPattern) {
Matrix adjustedMatrix = mTransform;
if (aPatternTransform)
AdjustTransformForPattern(adjustedMatrix, aTarget->GetTransform(), aPatternTransform);
mGfxPattern = new (mSurfacePattern.addr())
SurfacePattern(mSourceSurface, ToExtendMode(mExtend), adjustedMatrix, mFilter);
return mGfxPattern;
}
GraphicsExtend extend = GraphicsExtend(cairo_pattern_get_extend(mPattern));
switch (cairo_pattern_get_type(mPattern)) {
case CAIRO_PATTERN_TYPE_SOLID:
{
double r, g, b, a;
cairo_pattern_get_rgba(mPattern, &r, &g, &b, &a);
new (mColorPattern.addr()) ColorPattern(Color(r, g, b, a));
return mColorPattern.addr();
}
case CAIRO_PATTERN_TYPE_LINEAR:
{
double x1, y1, x2, y2;
cairo_pattern_get_linear_points(mPattern, &x1, &y1, &x2, &y2);
if (!mStops) {
int count = 0;
cairo_pattern_get_color_stop_count(mPattern, &count);
std::vector<GradientStop> stops;
for (int i = 0; i < count; i++) {
GradientStop stop;
double r, g, b, a, offset;
cairo_pattern_get_color_stop_rgba(mPattern, i, &offset, &r, &g, &b, &a);
stop.offset = offset;
stop.color = Color(Float(r), Float(g), Float(b), Float(a));
stops.push_back(stop);
}
mStops = aTarget->CreateGradientStops(&stops.front(), count, ToExtendMode(extend));
}
if (mStops) {
cairo_matrix_t mat;
cairo_pattern_get_matrix(mPattern, &mat);
gfxMatrix matrix(*reinterpret_cast<gfxMatrix*>(&mat));
Matrix newMat = ToMatrix(matrix);
AdjustTransformForPattern(newMat, aTarget->GetTransform(), aPatternTransform);
mGfxPattern = new (mLinearGradientPattern.addr())
LinearGradientPattern(Point(x1, y1), Point(x2, y2), mStops, newMat);
return mGfxPattern;
}
break;
}
case CAIRO_PATTERN_TYPE_RADIAL:
{
if (!mStops) {
int count = 0;
cairo_pattern_get_color_stop_count(mPattern, &count);
std::vector<GradientStop> stops;
for (int i = 0; i < count; i++) {
GradientStop stop;
double r, g, b, a, offset;
cairo_pattern_get_color_stop_rgba(mPattern, i, &offset, &r, &g, &b, &a);
stop.offset = offset;
stop.color = Color(Float(r), Float(g), Float(b), Float(a));
stops.push_back(stop);
}
mStops = aTarget->CreateGradientStops(&stops.front(), count, ToExtendMode(extend));
}
if (mStops) {
cairo_matrix_t mat;
cairo_pattern_get_matrix(mPattern, &mat);
gfxMatrix matrix(*reinterpret_cast<gfxMatrix*>(&mat));
Matrix newMat = ToMatrix(matrix);
AdjustTransformForPattern(newMat, aTarget->GetTransform(), aPatternTransform);
double x1, y1, x2, y2, r1, r2;
cairo_pattern_get_radial_circles(mPattern, &x1, &y1, &r1, &x2, &y2, &r2);
mGfxPattern = new (mRadialGradientPattern.addr())
RadialGradientPattern(Point(x1, y1), Point(x2, y2), r1, r2, mStops, newMat);
return mGfxPattern;
}
break;
}
Matrix* matrix = nullptr;
switch (mGfxPattern->GetType()) {
case PatternType::SURFACE:
matrix = &mSurfacePattern.addr()->mMatrix;
mSurfacePattern.addr()->mExtendMode = ToExtendMode(mExtend);
break;
case PatternType::LINEAR_GRADIENT:
matrix = &mLinearGradientPattern.addr()->mMatrix;
mLinearGradientPattern.addr()->mStops = mStops;
break;
case PatternType::RADIAL_GRADIENT:
matrix = &mRadialGradientPattern.addr()->mMatrix;
mRadialGradientPattern.addr()->mStops = mStops;
break;
default:
/* Reassure the compiler we are handling all the enum values. */
break;
}
new (mColorPattern.addr()) ColorPattern(Color(0, 0, 0, 0));
return mColorPattern.addr();
if (matrix) {
*matrix = mTransform;
if (aPatternTransform) {
AdjustTransformForPattern(*matrix,
aTarget->GetTransform(),
aPatternTransform);
}
}
return mGfxPattern;
}
void
gfxPattern::SetExtend(GraphicsExtend extend)
{
if (mPattern) {
mStops = nullptr;
if (extend == EXTEND_PAD_EDGE) {
extend = EXTEND_PAD;
}
cairo_pattern_set_extend(mPattern, (cairo_extend_t)extend);
} else {
// This is always a surface pattern and will default to EXTEND_PAD
// for EXTEND_PAD_EDGE.
mExtend = extend;
}
mExtend = extend;
mStops = nullptr;
}
bool
gfxPattern::IsOpaque()
{
if (mPattern) {
if (mGfxPattern->GetType() != PatternType::SURFACE) {
return false;
}
if (mSourceSurface->GetFormat() == SurfaceFormat::B8G8R8X8) {
if (mSurfacePattern.addr()->mSurface->GetFormat() == SurfaceFormat::B8G8R8X8) {
return true;
}
return false;
@ -300,64 +189,49 @@ gfxPattern::IsOpaque()
gfxPattern::GraphicsExtend
gfxPattern::Extend() const
{
if (mPattern) {
return GraphicsExtend(cairo_pattern_get_extend(mPattern));
} else {
return mExtend;
}
return mExtend;
}
void
gfxPattern::SetFilter(GraphicsFilter filter)
{
if (mPattern) {
cairo_pattern_set_filter(mPattern, (cairo_filter_t)(int)filter);
} else {
mFilter = ToFilter(filter);
if (mGfxPattern->GetType() != PatternType::SURFACE) {
return;
}
mSurfacePattern.addr()->mFilter = ToFilter(filter);
}
GraphicsFilter
gfxPattern::Filter() const
{
if (mPattern) {
return (GraphicsFilter)cairo_pattern_get_filter(mPattern);
} else {
return ThebesFilter(mFilter);
if (mGfxPattern->GetType() != PatternType::SURFACE) {
return GraphicsFilter::FILTER_GOOD;
}
return ThebesFilter(mSurfacePattern.addr()->mFilter);
}
bool
gfxPattern::GetSolidColor(gfxRGBA& aColor)
{
return cairo_pattern_get_rgba(mPattern,
&aColor.r,
&aColor.g,
&aColor.b,
&aColor.a) == CAIRO_STATUS_SUCCESS;
if (mGfxPattern->GetType() == PatternType::COLOR) {
aColor = ThebesColor(mColorPattern.addr()->mColor);
return true;
}
return false;
}
gfxPattern::GraphicsPatternType
gfxPattern::GetType() const
{
if (mPattern) {
return (GraphicsPatternType) cairo_pattern_get_type(mPattern);
} else {
// We should never be trying to get the type off an Azure gfx Pattern.
MOZ_ASSERT(0);
return PATTERN_SURFACE;
}
return ThebesPatternType(mGfxPattern->GetType());
}
int
gfxPattern::CairoStatus()
{
if (mPattern) {
return cairo_pattern_status(mPattern);
} else {
// An Azure pattern as this point is never in error status.
return CAIRO_STATUS_SUCCESS;
}
return CAIRO_STATUS_SUCCESS;
}
void

8
gfx/thebes/gfxPattern.h
View File

@ -93,16 +93,10 @@ public:
/* returns TRUE if it succeeded */
bool GetSolidColor(gfxRGBA& aColor);
bool IsAzure() { return !mPattern; }
mozilla::TemporaryRef<mozilla::gfx::SourceSurface> GetAzureSurface() { return mSourceSurface; }
private:
// Private destructor, to discourage deletion outside of Release():
~gfxPattern();
cairo_pattern_t *mPattern;
/**
* aPatternTransform is the cairo pattern transform --- from user space at
* the time the pattern was set, to pattern space.
@ -130,8 +124,8 @@ private:
mozilla::RefPtr<mozilla::gfx::SourceSurface> mSourceSurface;
mozilla::gfx::Matrix mTransform;
mozilla::RefPtr<mozilla::gfx::GradientStops> mStops;
nsTArray<mozilla::gfx::GradientStop> mStopsList;
GraphicsExtend mExtend;
mozilla::gfx::Filter mFilter;
};
#endif /* GFX_PATTERN_H */