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

merge mozilla-central to b2g-inbound

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2013-08-09 13:15:45 +02:00
commit 597c138d2f
6 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/2d/2D.h
View File

@ -292,7 +292,7 @@ public:
* aFilter Resampling filter used for resampling the image.
*/
SurfacePattern(SourceSurface *aSourceSurface, ExtendMode aExtendMode,
const Matrix &aMatrix = Matrix(), Filter aFilter = FILTER_GOOD)
const Matrix &aMatrix = Matrix(), Filter aFilter = FILTER_LINEAR)
: mSurface(aSourceSurface)
, mExtendMode(aExtendMode)
, mFilter(aFilter)

33
gfx/2d/DrawTargetCG.cpp
View File

@ -123,19 +123,6 @@ CGBlendMode ToBlendMode(CompositionOp op)
return mode;
}
static CGInterpolationQuality
InterpolationQualityFromFilter(Filter aFilter)
{
switch (aFilter) {
default:
case FILTER_LINEAR:
return kCGInterpolationLow;
case FILTER_POINT:
return kCGInterpolationNone;
case FILTER_GOOD:
return kCGInterpolationDefault;
}
}
DrawTargetCG::DrawTargetCG() : mCg(nullptr), mSnapshot(nullptr)
@ -304,7 +291,10 @@ DrawTargetCG::DrawSurface(SourceSurface *aSurface,
CGRect flippedRect = CGRectMake(aDest.x, -(aDest.y + aDest.height),
aDest.width, aDest.height);
CGContextSetInterpolationQuality(cg, InterpolationQualityFromFilter(aSurfOptions.mFilter));
if (aSurfOptions.mFilter == FILTER_POINT)
CGContextSetInterpolationQuality(cg, kCGInterpolationNone);
else
CGContextSetInterpolationQuality(cg, kCGInterpolationLow);
CGContextDrawImage(cg, flippedRect, image);
@ -663,7 +653,10 @@ SetFillFromPattern(CGContextRef cg, CGColorSpaceRef aColorSpace, const Pattern &
CGPatternRef pattern = CreateCGPattern(aPattern, CGContextGetCTM(cg));
const SurfacePattern& pat = static_cast<const SurfacePattern&>(aPattern);
CGContextSetInterpolationQuality(cg, InterpolationQualityFromFilter(pat.mFilter));
if (pat.mFilter == FILTER_POINT)
CGContextSetInterpolationQuality(cg, kCGInterpolationNone);
else
CGContextSetInterpolationQuality(cg, kCGInterpolationLow);
CGFloat alpha = 1.;
CGContextSetFillPattern(cg, pattern, &alpha);
CGPatternRelease(pattern);
@ -688,7 +681,10 @@ SetStrokeFromPattern(CGContextRef cg, CGColorSpaceRef aColorSpace, const Pattern
CGPatternRef pattern = CreateCGPattern(aPattern, CGContextGetCTM(cg));
const SurfacePattern& pat = static_cast<const SurfacePattern&>(aPattern);
CGContextSetInterpolationQuality(cg, InterpolationQualityFromFilter(pat.mFilter));
if (pat.mFilter == FILTER_POINT)
CGContextSetInterpolationQuality(cg, kCGInterpolationNone);
else
CGContextSetInterpolationQuality(cg, kCGInterpolationLow);
CGFloat alpha = 1.;
CGContextSetStrokePattern(cg, pattern, &alpha);
CGPatternRelease(pattern);
@ -774,7 +770,10 @@ DrawTargetCG::FillRect(const Rect &aRect,
CGRect imageRect = CGRectMake(0, 0, CGImageGetWidth(image), CGImageGetHeight(image));
CGContextSetInterpolationQuality(cg, InterpolationQualityFromFilter(pat.mFilter));
if (pat.mFilter == FILTER_POINT)
CGContextSetInterpolationQuality(cg, kCGInterpolationNone);
else
CGContextSetInterpolationQuality(cg, kCGInterpolationLow);
CGContextDrawImage(cg, imageRect, image);
} else {

2
gfx/2d/DrawTargetSkia.cpp
View File

@ -285,7 +285,7 @@ DrawTargetSkia::DrawSurface(SourceSurface *aSurface,
const SkBitmap& bitmap = static_cast<SourceSurfaceSkia*>(aSurface)->GetBitmap();
AutoPaintSetup paint(mCanvas.get(), aOptions);
if (aSurfOptions.mFilter == FILTER_POINT) {
if (aSurfOptions.mFilter != FILTER_LINEAR) {
paint.mPaint.setFilterBitmap(false);
}

2
gfx/2d/HelpersCairo.h
View File

@ -82,8 +82,6 @@ GfxFilterToCairoFilter(Filter filter)
{
switch (filter)
{
case FILTER_GOOD:
return CAIRO_FILTER_GOOD;
case FILTER_LINEAR:
return CAIRO_FILTER_BILINEAR;
case FILTER_POINT:

2
gfx/2d/Types.h
View File

@ -104,7 +104,7 @@ enum ExtendMode { EXTEND_CLAMP, EXTEND_REPEAT, EXTEND_REFLECT };
enum FillRule { FILL_WINDING, FILL_EVEN_ODD };
enum AntialiasMode { AA_NONE, AA_GRAY, AA_SUBPIXEL, AA_DEFAULT };
enum Snapping { SNAP_NONE, SNAP_ALIGNED };
enum Filter { FILTER_GOOD, FILTER_LINEAR, FILTER_POINT };
enum Filter { FILTER_LINEAR, FILTER_POINT };
enum PatternType { PATTERN_COLOR, PATTERN_SURFACE, PATTERN_LINEAR_GRADIENT, PATTERN_RADIAL_GRADIENT };
enum JoinStyle { JOIN_BEVEL, JOIN_ROUND, JOIN_MITER, JOIN_MITER_OR_BEVEL };
enum CapStyle { CAP_BUTT, CAP_ROUND, CAP_SQUARE };

2
gfx/thebes/gfx2DGlue.h
View File

@ -64,8 +64,6 @@ inline Filter ToFilter(gfxPattern::GraphicsFilter aFilter)
switch (aFilter) {
case gfxPattern::FILTER_NEAREST:
return FILTER_POINT;
case gfxPattern::FILTER_GOOD:
return FILTER_GOOD;
default:
return FILTER_LINEAR;
}