summaryrefslogtreecommitdiff
path: root/vcl/inc/skia/gdiimpl.hxx
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2020-04-24 16:58:09 +0000
committerLuboš Luňák <l.lunak@collabora.com>2020-05-04 21:46:46 +0200
commit16ab4c5cc82829927c2e876af7e511c0f1fb6284 (patch)
tree05b6f44a2c441bec31f23c7cd8654b99685c5b13 /vcl/inc/skia/gdiimpl.hxx
parent603df08a1e0211099ce2cf258cfe64a74ed6ded9 (diff)
remove old Skia text render methods that do not use Skia directly
The cairo-based method on Unix and manual glyph handling way taken from GL on Windows should be longer be needed, now that using Skia itself for text rendering seems to work fine. This reverts more or less reverts the following commits: b1d3ef798a89d11b853c467fa9ce0fe6ed235735 5ac9a62f3a354db80837bdd1c95b763989b303bb 619959827003814053a5e9ec81acfd07b3aa270a 6f5c85daa0e5073d87d1d7699bfa59af159686ca ad3580df085b3a3d66eb73cae997ea5ca178ccc1 f109a1ac6fdf0c878d53dfea6fceffd93248608f 59205c742c43b4c456b69c3fd94e7fa35ff3eec0 Change-Id: Ib28b2469c7d6471c227bb2aa08d5485bb24c2fe1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93428 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl/inc/skia/gdiimpl.hxx')
-rw-r--r--vcl/inc/skia/gdiimpl.hxx3
1 files changed, 0 insertions, 3 deletions
diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx
index 904053200d0a..68652cacc790 100644
--- a/vcl/inc/skia/gdiimpl.hxx
+++ b/vcl/inc/skia/gdiimpl.hxx
@@ -202,8 +202,6 @@ public:
// Default blend mode for SkPaint is SkBlendMode::kSrcOver
void drawImage(const SalTwoRect& rPosAry, const sk_sp<SkImage>& aImage,
SkBlendMode eBlendMode = SkBlendMode::kSrcOver);
- void drawBitmap(const SalTwoRect& rPosAry, const SkBitmap& aBitmap,
- SkBlendMode eBlendMode = SkBlendMode::kSrcOver);
enum class GlyphOrientation
{
@@ -300,7 +298,6 @@ protected:
std::unique_ptr<SkCanvas> mXorCanvas;
SkRegion mXorRegion; // the area that needs updating for the xor operation
std::unique_ptr<SkiaFlushIdle> mFlush;
- int mPendingPixelsToFlush;
};
#endif