Simplify SalGraphicsImpl::Init

it is only used for one thing, so rename it, and use a default implementation to avoid having empty implementations everywhere Change-Id: Ib650bb520ccbfcc27537b754db4d3de4ad10e638 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176733 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-11-19 16:55:43 +01:00
parent 256463f132
commit f1ab6d3e04
20 changed files with 7 additions and 37 deletions
@@ -24,8 +24,6 @@ SvpGraphicsBackend::SvpGraphicsBackend(CairoCommon& rCairoCommon)
 {
 }

-void SvpGraphicsBackend::Init() {}
-
 void SvpGraphicsBackend::setClipRegion(const vcl::Region& i_rClip)
 {
    m_rCairoCommon.m_aClipRegion = i_rClip;
@@ -34,8 +34,6 @@ class SAL_DLLPUBLIC_RTTI SvpGraphicsBackend final : public SalGraphicsImpl
 public:
    SvpGraphicsBackend(CairoCommon& rCairoCommon);

-    void Init() override;
-
    OUString getRenderBackendName() const override { return u"svp"_ustr; }

    void setClipRegion(vcl::Region const& rRegion) override;
@@ -59,8 +59,6 @@ public:
    QtGraphicsBackend(QtFrame* pFrame, QImage* pQImage);
    ~QtGraphicsBackend() override;

-    void Init() override {}
-
    QImage* getQImage() { return m_pQImage; }

    void setQImage(QImage* pQImage) { m_pQImage = pQImage; }
@@ -269,8 +269,6 @@ public:
    AquaGraphicsBackend(AquaSharedAttributes & rShared);
    ~AquaGraphicsBackend() override;

-    void Init() override;
-
    OUString getRenderBackendName() const override
    {
        return "aqua";
@@ -72,7 +72,8 @@ public:
    // so see the SalGraphics class for documentation (both uppercase and lowercase
    // function variants).

-    virtual void Init() = 0;
+    /// Only used by the X11SkiaSalGraphicsImpl backend
+    virtual void UpdateX11GeometryProvider() {}

    virtual void DeInit() {}

@@ -41,8 +41,6 @@ public:
    SkiaSalGraphicsImpl(SalGraphics& pParent, SalGeometryProvider* pProvider);
    virtual ~SkiaSalGraphicsImpl() override;

-    virtual void Init() override;
-
    virtual void DeInit() override;

    virtual OUString getRenderBackendName() const override { return u"skia"_ustr; }
@@ -24,7 +24,7 @@ private:
 public:
    X11SkiaSalGraphicsImpl(X11SalGraphics& rParent);

-    virtual void Init() override;
+    virtual void UpdateX11GeometryProvider() override;
    virtual void Flush() override;

    static void prepareSkia();
@@ -196,8 +196,6 @@ AquaGraphicsBackend::AquaGraphicsBackend(AquaSharedAttributes& rShared)

 AquaGraphicsBackend::~AquaGraphicsBackend() {}

-void AquaGraphicsBackend::Init() {}
-
 void AquaGraphicsBackend::setClipRegion(vcl::Region const& rRegion)
 {
    // release old clip path
@@ -301,8 +301,6 @@ SkiaSalGraphicsImpl::~SkiaSalGraphicsImpl()
    assert(!mWindowContext);
 }

-void SkiaSalGraphicsImpl::Init() {}
-
 void SkiaSalGraphicsImpl::createSurface()
 {
    SkiaZone zone;
@@ -59,7 +59,6 @@ AquaSkiaSalGraphicsImpl::AquaSkiaSalGraphicsImpl(AquaSalGraphics& rParent,
    : SkiaSalGraphicsImpl(rParent, rShared.mpFrame)
    , AquaGraphicsBackendBase(rShared, this)
 {
-    Init(); // mac code doesn't call Init()
 }

 AquaSkiaSalGraphicsImpl::~AquaSkiaSalGraphicsImpl()
@@ -35,11 +35,10 @@ X11SkiaSalGraphicsImpl::X11SkiaSalGraphicsImpl(X11SalGraphics& rParent)
 {
 }

-void X11SkiaSalGraphicsImpl::Init()
+void X11SkiaSalGraphicsImpl::UpdateX11GeometryProvider()
 {
    // The m_pFrame and m_pVDev pointers are updated late in X11
    setProvider(mX11Parent.GetGeometryProvider());
-    SkiaSalGraphicsImpl::Init();
 }

 void X11SkiaSalGraphicsImpl::createWindowSurfaceInternal(bool forceRaster)
@@ -26,7 +26,7 @@ void X11SalGraphics::Init(X11SkiaSalVirtualDevice* pDevice)
    m_pVDev = pDevice;
    m_pFrame = nullptr;

-    mxImpl->Init();
+    mxImpl->UpdateX11GeometryProvider();
 }

 X11SkiaSalVirtualDevice::X11SkiaSalVirtualDevice(const SalGraphics& rGraphics, tools::Long nDX,
@@ -196,8 +196,6 @@ std::shared_ptr<SalBitmap> X11CairoSalGraphicsImpl::getBitmap(tools::Long nX, to
    return mrCairoCommon.getBitmap(nX, nY, nWidth, nHeight);
 }

-void X11CairoSalGraphicsImpl::Init() {}
-
 bool X11CairoSalGraphicsImpl::drawPolyLineBezier(sal_uInt32, const Point*, const PolyFlags*)
 {
    return false;
@@ -33,8 +33,6 @@ private:
 public:
    X11CairoSalGraphicsImpl(X11SalGraphics& rParent, CairoCommon& rCairoCommon);

-    void Init() override;
-
    OUString getRenderBackendName() const override { return u"gen"_ustr; }

    // get the depth of the device
@@ -143,7 +143,7 @@ void X11SalGraphics::Init( X11SalFrame& rFrame, Drawable aTarget,
    m_pVDev     = nullptr;

    SetDrawable(aTarget, rFrame.GetSurface(), nXScreen);
-    mxImpl->Init();
+    mxImpl->UpdateX11GeometryProvider();
 }

 void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) // const
@@ -79,7 +79,7 @@ void X11SalGraphics::Init(X11SalVirtualDevice *pDevice, SalColormap* pColormap,
    m_pFrame     = nullptr;

    SetDrawable(pDevice->GetDrawable(), pDevice->GetSurface(), m_nXScreen);
-    mxImpl->Init();
+    mxImpl->UpdateX11GeometryProvider();
 }

 X11SalVirtualDevice::X11SalVirtualDevice(const SalGraphics& rGraphics, tools::Long &nDX, tools::Long &nDY,
@@ -235,10 +235,6 @@ WinSalGraphicsImpl::~WinSalGraphicsImpl()
    }
 }

-void WinSalGraphicsImpl::Init()
-{
-}
-
 bool WinSalGraphicsImpl::drawEPS(tools::Long, tools::Long, tools::Long, tools::Long, void*, sal_uInt32)
 {
    return false;
@@ -66,8 +66,6 @@ public:

    virtual ~WinSalGraphicsImpl() override;

-    virtual void Init() override;
-
    virtual OUString getRenderBackendName() const override { return "gdi"; }

    virtual void setClipRegion( const vcl::Region& ) override;
@@ -464,8 +464,6 @@ void WinSalGraphics::InitGraphics()
    ::SetTextAlign( getHDC(), TA_BASELINE | TA_LEFT | TA_NOUPDATECP );
    ::SetBkMode( getHDC(), TRANSPARENT );
    ::SetROP2( getHDC(), R2_COPYPEN );
-
-    mpImpl->Init();
 }

 void WinSalGraphics::DeInitGraphics()
@@ -214,9 +214,6 @@ bool WinSalVirtualDevice::SetSize( tools::Long nDX, tools::Long nDY )
    SelectBitmap(getHDC(), hNewBmp);
    mhBmp.reset(hNewBmp);

-    if (mpGraphics)
-        mpGraphics->GetImpl()->Init();
-
    return true;
 }