vcl: iOS/macOS - move graphic render func. into AquaGraphicsBackend

This change moves graphic rendering function under AquaSalGraphics
into a new AquaGraphicsBackend, which inherits from SalGraphicsImpl.
This is part of the refactoring to make it mandatory that a
SalGraphics always has a SalGraphicsImpl associated, which will
make it possible to simplify the SalGraphics interface and enable
the posibility to implement alernative graphic backends (Skia).

Common variables and attributes are moved to AquaSharedAttributes
and are shared between SalGraphics and SalGraphicsImpl.

Change-Id: Ie48da87002ec8e4011ba92fdc9170f3a86761517
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114701
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

3 files changed, 159 insertions, 160 deletions

diff --git a/vcl/osx/salgdiutils.cxx b/vcl/osx/salgdiutils.cxx
index f3ddd946f699..81210c8e876c 100644
--- a/vcl/osx/salgdiutils.cxx
+++ b/vcl/osx/salgdiutils.cxx
@@ -46,7 +46,9 @@
 static bool  bWindowScaling = false;
 static float fWindowScale = 1.0f;
 
-float AquaSalGraphics::GetWindowScaling()
+namespace sal::aqua
+{
+float getWindowScaling()
 {
     if (!bWindowScaling)
     {
@@ -65,38 +67,35 @@ float AquaSalGraphics::GetWindowScaling()
     }
     return fWindowScale;
 }
+} // end aqua
 
 void AquaSalGraphics::SetWindowGraphics( AquaSalFrame* pFrame )
 {
-    mpFrame = pFrame;
-    mbWindow = true;
-    mbPrinter = false;
-    mbVirDev = false;
+    maShared.mpFrame = pFrame;
+    maShared.mbWindow = true;
+    maShared.mbPrinter = false;
+    maShared.mbVirDev = false;
 }
 
 void AquaSalGraphics::SetPrinterGraphics( CGContextRef xContext, sal_Int32 nDPIX, sal_Int32 nDPIY )
 {
-    mbWindow = false;
-    mbPrinter = true;
-    mbVirDev = false;
+    maShared.mbWindow = false;
+    maShared.mbPrinter = true;
+    maShared.mbVirDev = false;
 
-    maContextHolder.set(xContext);
+    maShared.maContextHolder.set(xContext);
     mnRealDPIX = nDPIX;
     mnRealDPIY = nDPIY;
 
     // a previously set clip path is now invalid
-    if( mxClipPath )
-    {
-        CGPathRelease( mxClipPath );
-        mxClipPath = nullptr;
-    }
+    maShared.unsetClipPath();
 
-    if (maContextHolder.isSet())
+    if (maShared.maContextHolder.isSet())
     {
-        CGContextSetFillColorSpace( maContextHolder.get(), GetSalData()->mxRGBSpace );
-        CGContextSetStrokeColorSpace( maContextHolder.get(), GetSalData()->mxRGBSpace );
-        CGContextSaveGState( maContextHolder.get() );
-        SetState();
+        CGContextSetFillColorSpace( maShared.maContextHolder.get(), GetSalData()->mxRGBSpace );
+        CGContextSetStrokeColorSpace( maShared.maContextHolder.get(), GetSalData()->mxRGBSpace );
+        CGContextSaveGState( maShared.maContextHolder.get() );
+        maShared.setState();
     }
 }
 
@@ -104,50 +103,46 @@ void AquaSalGraphics::InvalidateContext()
 {
     UnsetState();
 
-    CGContextRelease(maContextHolder.get());
-    CGContextRelease(maBGContextHolder.get());
-    CGContextRelease(maCSContextHolder.get());
+    CGContextRelease(maShared.maContextHolder.get());
+    CGContextRelease(maShared.maBGContextHolder.get());
+    CGContextRelease(maShared.maCSContextHolder.get());
 
-    maContextHolder.set(nullptr);
-    maCSContextHolder.set(nullptr);
-    maBGContextHolder.set(nullptr);
+    maShared.maContextHolder.set(nullptr);
+    maShared.maCSContextHolder.set(nullptr);
+    maShared.maBGContextHolder.set(nullptr);
 }
 
 void AquaSalGraphics::UnsetState()
 {
-    if (maBGContextHolder.isSet())
-    {
-        CGContextRelease(maBGContextHolder.get());
-        maBGContextHolder.set(nullptr);
-    }
-    if (maCSContextHolder.isSet())
+    if (maShared.maBGContextHolder.isSet())
     {
-        CGContextRelease(maCSContextHolder.get());
-        maBGContextHolder.set(nullptr);
+        CGContextRelease(maShared.maBGContextHolder.get());
+        maShared.maBGContextHolder.set(nullptr);
     }
-    if (maContextHolder.isSet())
+    if (maShared.maCSContextHolder.isSet())
     {
-        maContextHolder.restoreState();
-        maContextHolder.set(nullptr);
+        CGContextRelease(maShared.maCSContextHolder.get());
+        maShared.maBGContextHolder.set(nullptr);
     }
-    if( mxClipPath )
+    if (maShared.maContextHolder.isSet())
     {
-        CGPathRelease( mxClipPath );
-        mxClipPath = nullptr;
+        maShared.maContextHolder.restoreState();
+        maShared.maContextHolder.set(nullptr);
     }
+    maShared.unsetState();
 }
 
 /**
  * (re-)create the off-screen maLayer we render everything to if
  * necessary: eg. not initialized yet, or it has an incorrect size.
  */
-bool AquaSalGraphics::CheckContext()
+bool AquaSharedAttributes::checkContext()
 {
     if (mbWindow && mpFrame && (mpFrame->getNSWindow() || Application::IsBitmapRendering()))
     {
         const unsigned int nWidth = mpFrame->maGeometry.nWidth;
         const unsigned int nHeight = mpFrame->maGeometry.nHeight;
-        const float fScale = GetWindowScaling();
+        const float fScale = sal::aqua::getWindowScaling();
         CGLayerRef rReleaseLayer = nullptr;
 
         // check if a new drawing context is needed (e.g. after a resize)
@@ -218,7 +213,7 @@ bool AquaSalGraphics::CheckContext()
                 // apply a scale matrix so everything is auto-magically scaled
                 CGContextScaleCTM(maContextHolder.get(), fScale, fScale);
                 maContextHolder.saveState();
-                SetState();
+                setState();
 
                 // re-enable XOR emulation for the new context
                 if (mpXorEmulation)
@@ -239,19 +234,19 @@ bool AquaSalGraphics::CheckContext()
  */
 void AquaSalGraphics::UpdateWindow( NSRect& )
 {
-    if( !mpFrame )
+    if (!maShared.mpFrame)
     {
         return;
     }
 
     NSGraphicsContext* pContext = [NSGraphicsContext currentContext];
-    if (maLayer.isSet() && pContext != nullptr)
+    if (maShared.maLayer.isSet() && pContext != nullptr)
     {
         CGContextHolder rCGContextHolder([pContext CGContext]);
 
         rCGContextHolder.saveState();
 
-        CGMutablePathRef rClip = mpFrame->getClipPath();
+        CGMutablePathRef rClip = maShared.mpFrame->getClipPath();
         if (rClip)
         {
             CGContextBeginPath(rCGContextHolder.get());
@@ -259,16 +254,16 @@ void AquaSalGraphics::UpdateWindow( NSRect& )
             CGContextClip(rCGContextHolder.get());
         }
 
-        ApplyXorContext();
+        maShared.applyXorContext();
 
-        const CGSize aSize = maLayer.getSizePoints();
+        const CGSize aSize = maShared.maLayer.getSizePoints();
         const CGRect aRect = CGRectMake(0, 0, aSize.width,  aSize.height);
-        const CGRect aRectPoints = { CGPointZero, maLayer.getSizePixels() };
-        CGContextSetBlendMode(maCSContextHolder.get(), kCGBlendModeCopy);
-        CGContextDrawLayerInRect(maCSContextHolder.get(), aRectPoints, maLayer.get());
+        const CGRect aRectPoints = { CGPointZero, maShared.maLayer.getSizePixels() };
+        CGContextSetBlendMode(maShared.maCSContextHolder.get(), kCGBlendModeCopy);
+        CGContextDrawLayerInRect(maShared.maCSContextHolder.get(), aRectPoints, maShared.maLayer.get());
 
-        CGImageRef img = CGBitmapContextCreateImage(maCSContextHolder.get());
-        CGImageRef displayColorSpaceImage = CGImageCreateCopyWithColorSpace(img, [[mpFrame->getNSWindow() colorSpace] CGColorSpace]);
+        CGImageRef img = CGBitmapContextCreateImage(maShared.maCSContextHolder.get());
+        CGImageRef displayColorSpaceImage = CGImageCreateCopyWithColorSpace(img, [[maShared.mpFrame->getNSWindow() colorSpace] CGColorSpace]);
         CGContextSetBlendMode(rCGContextHolder.get(), kCGBlendModeCopy);
         CGContextDrawImage(rCGContextHolder.get(), aRect, displayColorSpaceImage);
 
@@ -279,7 +274,7 @@ void AquaSalGraphics::UpdateWindow( NSRect& )
     }
     else
     {
-        SAL_WARN_IF( !mpFrame->mbInitShow, "vcl", "UpdateWindow called on uneligible graphics" );
+        SAL_WARN_IF(!maShared.mpFrame->mbInitShow, "vcl", "UpdateWindow called on uneligible graphics");
     }
 }
 
diff --git a/vcl/osx/salmacos.cxx b/vcl/osx/salmacos.cxx
index f6403dea2725..fa2520f056a6 100644
--- a/vcl/osx/salmacos.cxx
+++ b/vcl/osx/salmacos.cxx
@@ -96,29 +96,36 @@ bool QuartzSalBitmap::Create(CGLayerHolder const & rLayerHolder, int nBitmapBits
 
 // From salgdicommon.cxx
 
-void AquaSalGraphics::copyBits(const SalTwoRect &rPosAry, SalGraphics *pSrcGraphics)
+void AquaGraphicsBackend::copyBits(const SalTwoRect &rPosAry, SalGraphics *pSrcGraphics)
 {
-    if (!pSrcGraphics)
-        pSrcGraphics = this;
-    AquaSalGraphics *pSrc = static_cast<AquaSalGraphics*>(pSrcGraphics);
+    AquaSharedAttributes* pSrcShared = nullptr;
+
+    if (pSrcGraphics)
+    {
+        AquaSalGraphics* pSrc = static_cast<AquaSalGraphics*>(pSrcGraphics);
+        pSrcShared = &pSrc->getAquaGraphicsBackend()->mrShared;
+    }
+    else
+        pSrcShared = &mrShared;
+
     if (rPosAry.mnSrcWidth <= 0 || rPosAry.mnSrcHeight <= 0 || rPosAry.mnDestWidth <= 0 || rPosAry.mnDestHeight <= 0)
         return;
-    if (!maContextHolder.isSet())
+    if (!mrShared.maContextHolder.isSet())
         return;
 
-    SAL_WARN_IF (!pSrc->maLayer.isSet(), "vcl.quartz", "AquaSalGraphics::copyBits() from non-layered graphics this=" << this);
+    SAL_WARN_IF (!pSrcShared->maLayer.isSet(), "vcl.quartz", "AquaSalGraphics::copyBits() from non-layered graphics this=" << this);
 
     // Layered graphics are copied by AquaSalGraphics::copyScaledArea() which is able to consider the layer's scaling.
 
-    if (pSrc->maLayer.isSet())
+    if (pSrcShared->maLayer.isSet())
         copyScaledArea(rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnSrcX, rPosAry.mnSrcY,
-                       rPosAry.mnSrcWidth, rPosAry.mnSrcHeight, pSrcGraphics);
+                       rPosAry.mnSrcWidth, rPosAry.mnSrcHeight, pSrcShared);
     else
     {
-        ApplyXorContext();
-        pSrc->ApplyXorContext();
-        std::shared_ptr<SalBitmap> pBitmap = pSrc->getBitmap(rPosAry.mnSrcX, rPosAry.mnSrcY,
-                                                             rPosAry.mnSrcWidth, rPosAry.mnSrcHeight);
+        mrShared.applyXorContext();
+        pSrcShared->applyXorContext();
+        std::shared_ptr<SalBitmap> pBitmap = pSrcGraphics->GetImpl()->getBitmap(rPosAry.mnSrcX, rPosAry.mnSrcY,
+                                                                        rPosAry.mnSrcWidth, rPosAry.mnSrcHeight);
         if (pBitmap)
         {
             SalTwoRect aPosAry(rPosAry);
@@ -129,34 +136,30 @@ void AquaSalGraphics::copyBits(const SalTwoRect &rPosAry, SalGraphics *pSrcGraph
     }
 }
 
-void AquaSalGraphics::copyArea(tools::Long nDstX, tools::Long nDstY,tools::Long nSrcX, tools::Long nSrcY,
+void AquaGraphicsBackend::copyArea(tools::Long nDstX, tools::Long nDstY,tools::Long nSrcX, tools::Long nSrcY,
                                tools::Long nSrcWidth, tools::Long nSrcHeight, bool)
 {
-    if (!maContextHolder.isSet())
+    if (!mrShared.maContextHolder.isSet())
         return;
 
     // Functionality is implemented in protected member function AquaSalGraphics::copyScaledArea() which requires an additional
     // parameter of type SalGraphics to be used in AquaSalGraphics::copyBits() too.
 
-    copyScaledArea(nDstX, nDstY, nSrcX, nSrcY, nSrcWidth, nSrcHeight, this);
+    copyScaledArea(nDstX, nDstY, nSrcX, nSrcY, nSrcWidth, nSrcHeight, &mrShared);
 }
 
-void AquaSalGraphics::copyScaledArea(tools::Long nDstX, tools::Long nDstY,tools::Long nSrcX, tools::Long nSrcY,
-                                     tools::Long nSrcWidth, tools::Long nSrcHeight, SalGraphics *pSrcGraphics)
+void AquaGraphicsBackend::copyScaledArea(tools::Long nDstX, tools::Long nDstY,tools::Long nSrcX, tools::Long nSrcY,
+                                     tools::Long nSrcWidth, tools::Long nSrcHeight, AquaSharedAttributes* pSrcShared)
 {
-    if (!pSrcGraphics)
-        pSrcGraphics = this;
-    AquaSalGraphics *pSrc = static_cast<AquaSalGraphics*>(pSrcGraphics);
-
-    SAL_WARN_IF(!maLayer.isSet(), "vcl.quartz",
+    SAL_WARN_IF(!mrShared.maLayer.isSet(), "vcl.quartz",
                 "AquaSalGraphics::copyScaledArea() without graphics context or for non-layered graphics this=" << this);
 
-    if (!maContextHolder.isSet() || !maLayer.isSet())
+    if (!mrShared.maContextHolder.isSet() || !mrShared.maLayer.isSet())
         return;
 
     // Determine scaled geometry of source and target area assuming source and target area have the same scale
 
-    float fScale = maLayer.getScale();
+    float fScale = mrShared.maLayer.getScale();
     CGFloat nScaledSourceX = nSrcX * fScale;
     CGFloat nScaledSourceY = nSrcY * fScale;
     CGFloat nScaledTargetX = nDstX * fScale;
@@ -166,11 +169,11 @@ void AquaSalGraphics::copyScaledArea(tools::Long nDstX, tools::Long nDstY,tools:
 
     // Apply XOR context and get copy context from current graphics context or XOR context
 
-    ApplyXorContext();
-    maContextHolder.saveState();
-    CGContextRef xCopyContext = maContextHolder.get();
-    if (mpXorEmulation && mpXorEmulation->IsEnabled())
-        xCopyContext = mpXorEmulation->GetTargetContext();
+    mrShared.applyXorContext();
+    mrShared.maContextHolder.saveState();
+    CGContextRef xCopyContext = mrShared.maContextHolder.get();
+    if (mrShared.mpXorEmulation && mrShared.mpXorEmulation->IsEnabled())
+        xCopyContext = mrShared.mpXorEmulation->GetTargetContext();
 
     // Set scale matrix of copy context to consider layer scaling
 
@@ -179,19 +182,19 @@ void AquaSalGraphics::copyScaledArea(tools::Long nDstX, tools::Long nDstY,tools:
     // Creating an additional layer is required for drawing with the required scale and extent at the drawing destination
     // thereafter.
 
-    CGLayerHolder aSourceLayerHolder(pSrc->maLayer);
+    CGLayerHolder aSourceLayerHolder(pSrcShared->maLayer);
     const CGSize aSourceSize = CGSizeMake(nScaledSourceWidth, nScaledSourceHeight);
     aSourceLayerHolder.set(CGLayerCreateWithContext(xCopyContext, aSourceSize, nullptr));
     const CGContextRef xSourceContext = CGLayerGetContext(aSourceLayerHolder.get());
     CGPoint aSrcPoint = CGPointMake(-nScaledSourceX, -nScaledSourceY);
-    if (pSrc->IsFlipped())
+    if (pSrcShared->isFlipped())
     {
         CGContextTranslateCTM(xSourceContext, 0, nScaledSourceHeight);
         CGContextScaleCTM(xSourceContext, 1, -1);
-        aSrcPoint.y = nScaledSourceY + nScaledSourceHeight - mnHeight * fScale;
+        aSrcPoint.y = nScaledSourceY + nScaledSourceHeight - mrShared.mnHeight * fScale;
     }
     CGContextSetBlendMode(xSourceContext, kCGBlendModeCopy);
-    CGContextDrawLayerAtPoint(xSourceContext, aSrcPoint, pSrc->maLayer.get());
+    CGContextDrawLayerAtPoint(xSourceContext, aSrcPoint, pSrcShared->maLayer.get());
 
     // Copy source area from additional layer to target area
 
@@ -201,10 +204,11 @@ void AquaSalGraphics::copyScaledArea(tools::Long nDstX, tools::Long nDstY,tools:
 
     // Housekeeping on exit
 
-    maContextHolder.restoreState();
-    if (aSourceLayerHolder.get() != maLayer.get())
+    mrShared.maContextHolder.restoreState();
+    if (aSourceLayerHolder.get() != mrShared.maLayer.get())
         CGLayerRelease(aSourceLayerHolder.get());
-    RefreshRect(nDstX, nDstY, nSrcWidth, nSrcHeight);
+
+    mrShared.refreshRect(nDstX, nDstY, nSrcWidth, nSrcHeight);
 }
 
 void AquaSalGraphics::SetVirDevGraphics(CGLayerHolder const &rLayer, CGContextRef xContext, int nBitmapDepth)
@@ -214,61 +218,61 @@ void AquaSalGraphics::SetVirDevGraphics(CGLayerHolder const &rLayer, CGContextRe
     // Set member variables
 
     InvalidateContext();
-    mbWindow = false;
-    mbPrinter = false;
-    mbVirDev = true;
-    maLayer = rLayer;
-    mnBitmapDepth = nBitmapDepth;
+    maShared.mbWindow = false;
+    maShared.mbPrinter = false;
+    maShared.mbVirDev = true;
+    maShared.maLayer = rLayer;
+    maShared.mnBitmapDepth = nBitmapDepth;
 
-    // Get size and scale from layer if set else from bitmap and AquaSalGraphics::GetWindowScaling(), which is used to determine
+    // Get size and scale from layer if set else from bitmap and sal::aqua::getWindowScaling(), which is used to determine
     // scaling for direct graphics output too
 
     CGSize aSize;
     float fScale;
-    if (maLayer.isSet())
+    if (maShared.maLayer.isSet())
     {
-        maContextHolder.set(CGLayerGetContext(maLayer.get()));
-        aSize = CGLayerGetSize(maLayer.get());
-        fScale = maLayer.getScale();
+        maShared.maContextHolder.set(CGLayerGetContext(maShared.maLayer.get()));
+        aSize = CGLayerGetSize(maShared.maLayer.get());
+        fScale = maShared.maLayer.getScale();
     }
     else
     {
-        maContextHolder.set(xContext);
+        maShared.maContextHolder.set(xContext);
         if (!xContext)
             return;
         aSize.width = CGBitmapContextGetWidth(xContext);
         aSize.height = CGBitmapContextGetHeight(xContext);
-        fScale = GetWindowScaling();
+        fScale = sal::aqua::getWindowScaling();
     }
-    mnWidth = aSize.width / fScale;
-    mnHeight = aSize.height / fScale;
+    maShared.mnWidth = aSize.width / fScale;
+    maShared.mnHeight = aSize.height / fScale;
 
     // Set color space for fill and stroke
 
     CGColorSpaceRef aColorSpace = GetSalData()->mxRGBSpace;
-    CGContextSetFillColorSpace(maContextHolder.get(), aColorSpace);
-    CGContextSetStrokeColorSpace(maContextHolder.get(), aColorSpace);
+    CGContextSetFillColorSpace(maShared.maContextHolder.get(), aColorSpace);
+    CGContextSetStrokeColorSpace(maShared.maContextHolder.get(), aColorSpace);
 
     // Apply scale matrix to virtual device graphics
 
-    CGContextScaleCTM(maContextHolder.get(), fScale, fScale);
+    CGContextScaleCTM(maShared.maContextHolder.get(), fScale, fScale);
 
     // Apply XOR emulation if required
 
-    if (mpXorEmulation)
+    if (maShared.mpXorEmulation)
     {
-        mpXorEmulation->SetTarget(mnWidth, mnHeight, mnBitmapDepth, maContextHolder.get(), maLayer.get());
-        if (mpXorEmulation->IsEnabled())
-            maContextHolder.set(mpXorEmulation->GetMaskContext());
+        maShared.mpXorEmulation->SetTarget(maShared.mnWidth, maShared.mnHeight, maShared.mnBitmapDepth, maShared.maContextHolder.get(), maShared.maLayer.get());
+        if (maShared.mpXorEmulation->IsEnabled())
+            maShared.maContextHolder.set(maShared.mpXorEmulation->GetMaskContext());
     }
 
     // Housekeeping on exit
 
-    maContextHolder.saveState();
-    SetState();
+    maShared.maContextHolder.saveState();
+    maShared.setState();
 
     SAL_INFO("vcl.quartz", "SetVirDevGraphics() this=" << this <<
-             " (" << mnWidth << "x" << mnHeight << ") fScale=" << fScale << " mnBitmapDepth=" << mnBitmapDepth);
+             " (" << maShared.mnWidth << "x" << maShared.mnHeight << ") fScale=" << fScale << " mnBitmapDepth=" << maShared.mnBitmapDepth);
 }
 
 // From salvd.cxx
@@ -277,7 +281,7 @@ void AquaSalVirtualDevice::Destroy()
 {
     SAL_INFO( "vcl.virdev", "AquaSalVirtualDevice::Destroy() this=" << this << " mbForeignContext=" << mbForeignContext );
 
-    if( mbForeignContext )
+    if (mbForeignContext)
     {
         // Do not delete mxContext that we have received from outside VCL
         maLayer.set(nullptr);
@@ -327,11 +331,11 @@ bool AquaSalVirtualDevice::SetSize(tools::Long nDX, tools::Long nDY)
     Destroy();
 
     // Prepare new graphics context for initialization, use scaling independent of prior graphics context calculated by
-    // AquaSalGraphics::GetWindowScaling(), which is used to determine scaling for direct graphics output too
+    // sal::aqua::getWindowScaling(), which is used to determine scaling for direct graphics output too
 
     mnWidth = nDX;
     mnHeight = nDY;
-    fScale = AquaSalGraphics::GetWindowScaling();
+    fScale = sal::aqua::getWindowScaling();
     CGColorSpaceRef aColorSpace;
     uint32_t nFlags;
     if (mnBitmapDepth && (mnBitmapDepth < 16))
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index bc132ee88d16..589feec62208 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -232,8 +232,8 @@ UInt32 AquaSalGraphics::getState(ControlState nState)
     // there are non key windows which are children of key windows, e.g. autofilter configuration dialog or sidebar dropdown dialogs.
     // To handle these windows correctly, parent frame's key window state is considered here additionally.
 
-    const bool bDrawActive = mpFrame == nullptr || [mpFrame->getNSWindow() isKeyWindow]
-                             || mpFrame->mpParent == nullptr || [mpFrame->mpParent->getNSWindow() isKeyWindow];
+    const bool bDrawActive = maShared.mpFrame == nullptr || [maShared.mpFrame->getNSWindow() isKeyWindow]
+                             || maShared.mpFrame->mpParent == nullptr || [maShared.mpFrame->mpParent->getNSWindow() isKeyWindow];
     if (!(nState & ControlState::ENABLED) || !bDrawActive)
     {
         return kThemeStateInactive;
@@ -245,7 +245,7 @@ UInt32 AquaSalGraphics::getState(ControlState nState)
 
 UInt32 AquaSalGraphics::getTrackState(ControlState nState)
 {
-    const bool bDrawActive = mpFrame == nullptr || [mpFrame->getNSWindow() isKeyWindow];
+    const bool bDrawActive = maShared.mpFrame == nullptr || [maShared.mpFrame->getNSWindow() isKeyWindow];
     if (!(nState & ControlState::ENABLED) || !bDrawActive)
         return kThemeTrackInactive;
     return kThemeTrackActive;
@@ -260,9 +260,9 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                                         const Color&)
 {
     bool bOK = false;
-    if (!CheckContext())
+    if (!maShared.checkContext())
         return false;
-    maContextHolder.saveState();
+    maShared.maContextHolder.saveState();
     tools::Rectangle buttonRect = rControlRegion;
     HIRect rc = ImplGetHIRectFromRectangle(buttonRect);
     switch (nType)
@@ -274,15 +274,15 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                 aMenuItemDrawInfo.version = 0;
                 aMenuItemDrawInfo.state = kThemeMenuActive;
                 aMenuItemDrawInfo.itemType = kThemeMenuItemHierBackground;
-                HIThemeDrawMenuItem(&rc, &rc, &aMenuItemDrawInfo, maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
+                HIThemeDrawMenuItem(&rc, &rc, &aMenuItemDrawInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
 #else
                 if (rControlRegion.Top() == 0 && nPart == ControlPart::DrawBackgroundHorz)
                 {
-                    const bool bDrawActive = mpFrame == nullptr || [mpFrame->getNSWindow() isKeyWindow];
+                    const bool bDrawActive = maShared.mpFrame == nullptr || [maShared.mpFrame->getNSWindow() isKeyWindow];
                     CGFloat unifiedHeight = rControlRegion.GetHeight();
                     CGRect drawRect = CGRectMake(rControlRegion.Left(), rControlRegion.Top(),
                                                  rControlRegion.GetWidth(), rControlRegion.GetHeight());
-                    CUIDraw([NSWindow coreUIRenderer], drawRect, maContextHolder.get(),
+                    CUIDraw([NSWindow coreUIRenderer], drawRect, maShared.maContextHolder.get(),
                             reinterpret_cast<CFDictionaryRef>([NSDictionary dictionaryWithObjectsAndKeys:
                                                                @"kCUIWidgetWindowFrame",
                                                                @"widget",
@@ -305,7 +305,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     aMenuItemDrawInfo.version = 0;
                     aMenuItemDrawInfo.state = kThemeMenuActive;
                     aMenuItemDrawInfo.itemType = kThemeMenuItemHierBackground;
-                    HIThemeDrawMenuItem(&rc, &rc, &aMenuItemDrawInfo, maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
+                    HIThemeDrawMenuItem(&rc, &rc, &aMenuItemDrawInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
                 }
 #endif
                 bOK = true;
@@ -322,8 +322,8 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 
                 rc.size.width += 2;
                 rc.size.height += 2;
-                HIThemeApplyBackground( &rc, &aThemeBackgroundInfo, maContextHolder.get(), kHIThemeOrientationNormal);
-                CGContextFillRect(maContextHolder.get(), rc);
+                HIThemeApplyBackground( &rc, &aThemeBackgroundInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
+                CGContextFillRect(maShared.maContextHolder.get(), rc);
                 bOK = true;
             }
             break;
@@ -335,8 +335,8 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                 aThemeBackgroundInfo.kind = kThemeBrushAlertBackgroundActive;
                 rc.size.width += 2;
                 rc.size.height += 2;
-                HIThemeApplyBackground(&rc, &aThemeBackgroundInfo, maContextHolder.get(), kHIThemeOrientationNormal);
-                CGContextFillRect(maContextHolder.get(), rc);
+                HIThemeApplyBackground(&rc, &aThemeBackgroundInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
+                CGContextFillRect(maShared.maContextHolder.get(), rc);
                 bOK = true;
             }
             break;
@@ -369,11 +369,11 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 
                 // repaints the background of the pull down menu
 
-                HIThemeDrawMenuBackground(&rc, &aMenuInfo,maContextHolder.get(), kHIThemeOrientationNormal);
+                HIThemeDrawMenuBackground(&rc, &aMenuInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
 
                 // repaints the item either blue (selected) and/or grey (active only)
 
-                HIThemeDrawMenuItem(&rc, &rc, &aMenuItemDrawInfo, maContextHolder.get(), kHIThemeOrientationNormal, &rc);
+                HIThemeDrawMenuItem(&rc, &rc, &aMenuItemDrawInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal, &rc);
                 bOK = true;
             }
             else if (nPart == ControlPart::MenuItemCheckMark || nPart == ControlPart::MenuItemRadioMark)
@@ -397,7 +397,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     if (nState & ControlState::SELECTED) aTextInfo.state = kThemeStatePressed;
                     UniChar mark=(nPart == ControlPart::MenuItemCheckMark) ? kCheckUnicode: kBulletUnicode;
                     CFStringRef cfString = CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, &mark, 1, kCFAllocatorNull);
-                    HIThemeDrawTextBox(cfString, &rc, &aTextInfo, maContextHolder.get(), kHIThemeOrientationNormal);
+                    HIThemeDrawTextBox(cfString, &rc, &aTextInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
                     if (cfString)
                         CFRelease(cfString);
                     bOK = true;
@@ -449,7 +449,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                 aPushInfo.adornment = (nState & ControlState::DEFAULT) ? kThemeAdornmentDefault : kThemeAdornmentNone;
                 if (nState & ControlState::FOCUSED)
                     aPushInfo.adornment |= kThemeAdornmentFocus;
-                HIThemeDrawButton(&rc, &aPushInfo, maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
+                HIThemeDrawButton(&rc, &aPushInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
                 bOK = true;
             }
             break;
@@ -485,7 +485,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                 rc.size.height = RADIO_BUTTON_SMALL_SIZE;
                 rc.origin.x += FOCUS_RING_WIDTH;
                 rc.origin.y += FOCUS_RING_WIDTH;
-                HIThemeDrawButton(&rc, &aInfo, maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
+                HIThemeDrawButton(&rc, &aInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
                 bOK = true;
             }
             break;
@@ -511,7 +511,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     default:
                         break;
                 }
-                HIThemeDrawButton(&rc, &aInfo, maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
+                HIThemeDrawButton(&rc, &aInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
                 bOK = true;
             }
             break;
@@ -538,7 +538,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     aTrackInfo.enableState  = kThemeTrackActive;
                 aTrackInfo.filler1  = 0;
                 aTrackInfo.trackInfo.progress.phase = static_cast<long long>(CFAbsoluteTimeGetCurrent() * 10.0);
-                HIThemeDrawTrack(&aTrackInfo, nullptr, maContextHolder.get(), kHIThemeOrientationNormal);
+                HIThemeDrawTrack(&aTrackInfo, nullptr, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
                 bOK = true;
             }
             break;
@@ -562,7 +562,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     aSlideInfo.thumbDir = kThemeThumbUpward;
                     aSlideInfo.pressState = 0;
                     aTrackDraw.trackInfo.slider = aSlideInfo;
-                    HIThemeDrawTrack(&aTrackDraw, nullptr, maContextHolder.get(), kHIThemeOrientationNormal);
+                    HIThemeDrawTrack(&aTrackDraw, nullptr, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
                     bOK = true;
                 }
             }
@@ -597,7 +597,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                         if (pScrollbarVal->mnThumbState & ControlState::PRESSED)
                             aScrollInfo.pressState = kThemeThumbPressed;
                     aTrackDraw.trackInfo.scrollbar = aScrollInfo;
-                    HIThemeDrawTrack(&aTrackDraw, nullptr, maContextHolder.get(), kHIThemeOrientationNormal);
+                    HIThemeDrawTrack(&aTrackDraw, nullptr, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
                     bOK = true;
                 }
             }
@@ -617,7 +617,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                 rc.origin.y -= TAB_HEIGHT / 2;
                 rc.size.height += TAB_HEIGHT / 2;
                 rc.size.width -= 2;
-                HIThemeDrawTabPane(&rc, &aTabPaneDrawInfo, maContextHolder.get(), kHIThemeOrientationNormal);
+                HIThemeDrawTabPane(&rc, &aTabPaneDrawInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
                 bOK = true;
             }
             break;
@@ -661,7 +661,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     else if (aTabItemDrawInfo.position == kHIThemeTabPositionLast)
                         aTabItemDrawInfo.position = kHIThemeTabPositionFirst;
                 }
-                HIThemeDrawTab(&rc, &aTabItemDrawInfo, maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
+                HIThemeDrawTab(&rc, &aTabItemDrawInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
                 bOK=true;
             }
             break;
@@ -683,10 +683,10 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 
                 // fill a white background, because HIThemeDrawFrame only draws the border
 
-                CGContextFillRect(maContextHolder.get(), CGRectMake(rc.origin.x, rc.origin.y, rc.size.width, rc.size.height));
-                HIThemeDrawFrame(&rc, &aTextDrawInfo, maContextHolder.get(), kHIThemeOrientationNormal);
+                CGContextFillRect(maShared.maContextHolder.get(), CGRectMake(rc.origin.x, rc.origin.y, rc.size.width, rc.size.height));
+                HIThemeDrawFrame(&rc, &aTextDrawInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
                 if (nState & ControlState::FOCUSED)
-                    HIThemeDrawFocusRect(&rc, true, maContextHolder.get(), kHIThemeOrientationNormal);
+                    HIThemeDrawFocusRect(&rc, true, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
                 bOK = true;
             }
             break;
@@ -705,7 +705,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                 rc.size.height = COMBOBOX_HEIGHT;
                 rc.origin.x += FOCUS_RING_WIDTH;
                 rc.origin.y += FOCUS_RING_WIDTH;
-                HIThemeDrawButton(&rc, &aComboInfo, maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
+                HIThemeDrawButton(&rc, &aComboInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
                 bOK = true;
             }
             break;
@@ -726,7 +726,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     rc.size.height = LISTBOX_HEIGHT;
                     rc.origin.x += FOCUS_RING_WIDTH;
                     rc.origin.y += FOCUS_RING_WIDTH;
-                    HIThemeDrawButton(&rc, &aListInfo, maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
+                    HIThemeDrawButton(&rc, &aListInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
                     bOK = true;
                     break;
                 case ControlPart::ListboxWindow:
@@ -735,7 +735,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     aTextDrawInfo.kind = kHIThemeFrameListBox;
                     aTextDrawInfo.state = kThemeStateActive;
                     aTextDrawInfo.isFocused = false;
-                    HIThemeDrawFrame(&rc, &aTextDrawInfo, maContextHolder.get(), kHIThemeOrientationNormal);
+                    HIThemeDrawFrame(&rc, &aTextDrawInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
                     bOK = true;
                     break;
                 default:
@@ -760,10 +760,10 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 
                 // fill a white background, because HIThemeDrawFrame only draws the border
 
-                CGContextFillRect(maContextHolder.get(), CGRectMake(rc.origin.x, rc.origin.y, rc.size.width, rc.size.height));
-                HIThemeDrawFrame(&rc, &aTextDrawInfo, maContextHolder.get(), kHIThemeOrientationNormal);
+                CGContextFillRect(maShared.maContextHolder.get(), CGRectMake(rc.origin.x, rc.origin.y, rc.size.width, rc.size.height));
+                HIThemeDrawFrame(&rc, &aTextDrawInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
                 if (nState & ControlState::FOCUSED)
-                    HIThemeDrawFocusRect(&rc, true, maContextHolder.get(), kHIThemeOrientationNormal);
+                    HIThemeDrawFocusRect(&rc, true, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
 
                 // buttons
 
@@ -808,7 +808,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     rc.origin.y -= 1;
                     rc.size.width = SPIN_BUTTON_WIDTH;
                     rc.size.height = SPIN_LOWER_BUTTON_HEIGHT + SPIN_LOWER_BUTTON_HEIGHT;
-                    HIThemeDrawButton(&rc, &aSpinInfo, maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
+                    HIThemeDrawButton(&rc, &aSpinInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal, nullptr);
                 }
                 bOK = true;
             }
@@ -824,14 +824,14 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                         // strange effects start to happen when HIThemeDrawFrame meets the border of the window.
                         // These can be avoided by clipping to the boundary of the frame (see issue 84756)
 
-                        if (rc.origin.y + rc.size.height >= mpFrame->maGeometry.nHeight - 3)
+                        if (rc.origin.y + rc.size.height >= maShared.mpFrame->maGeometry.nHeight - 3)
                         {
                             CGMutablePathRef rPath = CGPathCreateMutable();
                             CGPathAddRect(rPath, nullptr,
-                                          CGRectMake(0, 0, mpFrame->maGeometry.nWidth - 1, mpFrame->maGeometry.nHeight - 1));
-                            CGContextBeginPath(maContextHolder.get());
-                            CGContextAddPath(maContextHolder.get(), rPath);
-                            CGContextClip(maContextHolder.get());
+                                          CGRectMake(0, 0, maShared.mpFrame->maGeometry.nWidth - 1, maShared.mpFrame->maGeometry.nHeight - 1));
+                            CGContextBeginPath(maShared.maContextHolder.get());
+                            CGContextAddPath(maShared.maContextHolder.get(), rPath);
+                            CGContextClip(maShared.maContextHolder.get());
                             CGPathRelease(rPath);
                         }
                         HIThemeFrameDrawInfo aTextDrawInfo;
@@ -839,7 +839,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                         aTextDrawInfo.kind = kHIThemeFrameListBox;
                         aTextDrawInfo.state = kThemeStateActive;
                         aTextDrawInfo.isFocused = false;
-                        HIThemeDrawFrame(&rc, &aTextDrawInfo, maContextHolder.get(), kHIThemeOrientationNormal);
+                        HIThemeDrawFrame(&rc, &aTextDrawInfo, maShared.maContextHolder.get(), kHIThemeOrientationNormal);
                         bOK = true;
                     }
                 }
@@ -854,7 +854,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
         default:
             break;
     }
-    maContextHolder.restoreState();
+    maShared.maContextHolder.restoreState();
 
     // in most cases invalidating the whole control region instead of just the unclipped part of it is sufficient (and probably
     // faster). However for the window background we should not unnecessarily enlarge the really changed rectangle since the
@@ -864,15 +864,15 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
     if (nType == ControlType::WindowBackground)
     {
         CGRect aRect = {{0, 0}, {0, 0}};
-        if (mxClipPath)
-            aRect = CGPathGetBoundingBox(mxClipPath);
+        if (maShared.mxClipPath)
+            aRect = CGPathGetBoundingBox(maShared.mxClipPath);
         if (aRect.size.width != 0 && aRect.size.height != 0)
             buttonRect.Intersection(tools::Rectangle(Point(static_cast<tools::Long>(aRect.origin.x),
                                                            static_cast<tools::Long>(aRect.origin.y)),
                                                      Size(static_cast<tools::Long>(aRect.size.width),
                                                           static_cast<tools::Long>(aRect.size.height))));
     }
-    RefreshRect(buttonRect.Left(), buttonRect.Top(), buttonRect.GetWidth(), buttonRect.GetHeight());
+    maShared.refreshRect(buttonRect.Left(), buttonRect.Top(), buttonRect.GetWidth(), buttonRect.GetHeight());
     return bOK;
 }