summaryrefslogtreecommitdiff
path: root/vcl/skia
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2020-09-25 12:50:46 +0200
committerTomaž Vajngerl <quikee@gmail.com>2020-09-28 13:35:42 +0200
commit76597aa62a09997beb794669008ce880327bda39 (patch)
treee2aee9db504a9ed472c31fae53724d23ca225f1d /vcl/skia
parent15a5a56326761b79c9ea56b99a05faee457f1a1b (diff)
rename for disentangling AA and B2D use in VCL drawing
This renames AntialiasingFlags::EnableB2dDraw to just Enable, and the AntiAliasB2DDraw names to just AntiAlias. This is in preparation for a second commit that will actually separate the AA and B2D functionality of these flags. Change-Id: I9cc215c5752dfabce41e00e19d9074fc8dc3d4de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103416 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/skia')
-rw-r--r--vcl/skia/gdiimpl.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index fc384d58f78e..0fff8776fe8f 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -714,7 +714,7 @@ void SkiaSalGraphicsImpl::drawLine(long nX1, long nY1, long nX2, long nY2)
addXorRegion(SkRect::MakeLTRB(nX1, nY1, nX2, nY2).makeSorted());
SkPaint paint;
paint.setColor(toSkColor(mLineColor));
- paint.setAntiAlias(mParent.getAntiAliasB2DDraw());
+ paint.setAntiAlias(mParent.getAntiAlias());
getDrawCanvas()->drawLine(toSkX(nX1), toSkY(nY1), toSkX(nX2), toSkY(nY2), paint);
postDraw();
}
@@ -729,7 +729,7 @@ void SkiaSalGraphicsImpl::privateDrawAlphaRect(long nX, long nY, long nWidth, lo
addXorRegion(SkRect::MakeXYWH(nX, nY, nWidth, nHeight));
SkCanvas* canvas = getDrawCanvas();
SkPaint paint;
- paint.setAntiAlias(!blockAA && mParent.getAntiAliasB2DDraw());
+ paint.setAntiAlias(!blockAA && mParent.getAntiAlias());
if (mFillColor != SALCOLOR_NONE)
{
paint.setColor(toSkColorWithTransparency(mFillColor, fTransparency));
@@ -825,7 +825,7 @@ bool SkiaSalGraphicsImpl::drawPolyPolygon(const basegfx::B2DHomMatrix& rObjectTo
return true;
}
- performDrawPolyPolygon(aPolyPolygon, fTransparency, mParent.getAntiAliasB2DDraw());
+ performDrawPolyPolygon(aPolyPolygon, fTransparency, mParent.getAntiAlias());
return true;
}
@@ -908,7 +908,7 @@ bool SkiaSalGraphicsImpl::delayDrawPolyPolygon(const basegfx::B2DPolyPolygon& aP
// actually isn't handled here.
// Only AA polygons need merging, because they do not line up well because of the AA of the edges.
- if (!mParent.getAntiAliasB2DDraw())
+ if (!mParent.getAntiAlias())
return false;
// Only filled polygons without an outline are problematic.
if (mFillColor == SALCOLOR_NONE || mLineColor != SALCOLOR_NONE)
@@ -1053,9 +1053,9 @@ bool SkiaSalGraphicsImpl::drawPolyLine(const basegfx::B2DHomMatrix& rObjectToDev
aPaint.setColor(toSkColorWithTransparency(mLineColor, fTransparency));
aPaint.setStrokeMiter(fMiterLimit);
aPaint.setStrokeWidth(fLineWidth);
- aPaint.setAntiAlias(mParent.getAntiAliasB2DDraw());
+ aPaint.setAntiAlias(mParent.getAntiAlias());
// See the tdf#134346 comment above.
- const SkScalar posFix = mParent.getAntiAliasB2DDraw() ? toSkXYFix : 0;
+ const SkScalar posFix = mParent.getAntiAlias() ? toSkXYFix : 0;
if (pStroke && std::accumulate(pStroke->begin(), pStroke->end(), 0.0) != 0)
{
@@ -1826,7 +1826,7 @@ bool SkiaSalGraphicsImpl::drawGradient(const tools::PolyPolygon& rPolyPolygon,
}
SkPaint paint;
- paint.setAntiAlias(mParent.getAntiAliasB2DDraw());
+ paint.setAntiAlias(mParent.getAntiAlias());
paint.setShader(shader);
getDrawCanvas()->drawPath(path, paint);
postDraw();
@@ -1858,7 +1858,7 @@ bool SkiaSalGraphicsImpl::implDrawGradient(const basegfx::B2DPolyPolygon& rPolyP
sk_sp<SkShader> shader = SkGradientShader::MakeLinear(points, colors.data(), pos.data(),
colors.size(), SkTileMode::kDecal);
SkPaint paint;
- paint.setAntiAlias(mParent.getAntiAliasB2DDraw());
+ paint.setAntiAlias(mParent.getAntiAlias());
paint.setShader(shader);
getDrawCanvas()->drawPath(path, paint);
addXorRegion(path.getBounds());