diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-08-12 16:08:50 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-08-23 14:59:25 +0200 |
| commit | 09b16f9f44578182306c47cdabe92a31cc5d3b4c (patch) | |
| tree | 8dc5af22989d538e119d8d59dc1d87736a71b858 /vcl/inc | |
| parent | 13acc8a5df8db5fa24d72c1d44b35e41e4ca2a7c (diff) | |
make SalGeometryProvider available for Aqua VCL backends
This is needed for the Skia backend to know the geometry.
The Mac Skia code now passes most VCL unittests.
Change-Id: I6e35764d95ce821d8e11ed9979e5be75bcf6ff49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120806
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/quartz/salgdi.h | 3 | ||||
| -rw-r--r-- | vcl/inc/skia/osx/gdiimpl.hxx | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index ab7a25ee9b7c..8ec68cddcc09 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -285,6 +285,7 @@ public: mpImpl = dynamic_cast<SalGraphicsImpl*>(this); return mpImpl; } + virtual void UpdateGeometryProvider(SalGeometryProvider*) {}; }; inline AquaGraphicsBackendBase::~AquaGraphicsBackendBase() {} @@ -436,7 +437,7 @@ public: AquaSalGraphics(); virtual ~AquaSalGraphics() override; - void SetVirDevGraphics(CGLayerHolder const &rLayer, CGContextRef, int nBitDepth = 0); + void SetVirDevGraphics(SalVirtualDevice* pVirDev,CGLayerHolder const &rLayer, CGContextRef, int nBitDepth = 0); #ifdef MACOSX void initResolution( NSWindow* ); void copyResolution( AquaSalGraphics& ); diff --git a/vcl/inc/skia/osx/gdiimpl.hxx b/vcl/inc/skia/osx/gdiimpl.hxx index 8523d272e897..eabea4483c2d 100644 --- a/vcl/inc/skia/osx/gdiimpl.hxx +++ b/vcl/inc/skia/osx/gdiimpl.hxx @@ -24,11 +24,14 @@ public: AquaSkiaSalGraphicsImpl(AquaSalGraphics& rParent, AquaSharedAttributes& rShared); virtual ~AquaSkiaSalGraphicsImpl() override; - virtual void Init() override; virtual void DeInit() override; virtual void freeResources() override; // virtual void Flush() override; + virtual void UpdateGeometryProvider(SalGeometryProvider* provider) override + { + setProvider(provider); + } static void prepareSkia(); private: |