vcl/inc/skia/salbmp.hxx | 6 +++++- vcl/skia/salbmp.cxx | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-)
New commits: commit 5563780e246e8c0d5896337e3665ee6b3fa37752 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Wed Apr 23 20:45:14 2025 +0200 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Thu Apr 24 17:26:50 2025 +0200 tdf#165595 speedup drawinglayer processing skia images Not really sure why this code is needed here, seems like we could just put it into the SalBitmap base class, there is no actual logic being added. Change-Id: I2103ab392625c1e13e177ebbb753e111639f06a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184524 Tested-by: Jenkins Reviewed-by: Armin Le Grand <armin.le.gr...@me.com> (cherry picked from commit 48c7b7c06b918702eab88b58f05c09a3a4f19928) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184565 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx index 639436346d61..ba1328fc0dbe 100644 --- a/vcl/inc/skia/salbmp.hxx +++ b/vcl/inc/skia/salbmp.hxx @@ -28,7 +28,8 @@ #include <SkImage.h> -class VCL_PLUGIN_PUBLIC SkiaSalBitmap final : public SalBitmap +class VCL_PLUGIN_PUBLIC SkiaSalBitmap final : public SalBitmap, + public basegfx::SystemDependentDataHolder { public: SkiaSalBitmap(); @@ -64,6 +65,9 @@ public: virtual bool Erase(const Color& color) override; virtual bool AlphaBlendWith(const SalBitmap& rSalBmp) override; virtual bool Invert() override; + SAL_DLLPRIVATE virtual const basegfx::SystemDependentDataHolder* + accessSystemDependentDataHolder() const override; + #if defined MACOSX || defined IOS virtual CGImageRef CreateWithMask(const SalBitmap& rMask, int nX, int nY, int nWidth, int nHeight) const override; diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx index d517d425eaf1..7c4a0b6eaa8d 100644 --- a/vcl/skia/salbmp.cxx +++ b/vcl/skia/salbmp.cxx @@ -509,6 +509,11 @@ bool SkiaSalBitmap::Replace(const Color&, const Color&, sal_uInt8) return false; } +const basegfx::SystemDependentDataHolder* SkiaSalBitmap::accessSystemDependentDataHolder() const +{ + return this; +} + bool SkiaSalBitmap::ConvertToGreyscale() { #ifdef DBG_UTIL