make Skia Windows text rendering use SkImage instead of SkBitmap

This will allow making it GPU-backed, as SkImage can be GPU-backed,
SkBitmap cannot.

Change-Id: I047eefe83741a036d372d39e5fc6a4fa400e6504
Reviewed-on: https://gerrit.libreoffice.org/84559
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index c69795f70bd5..91e55a2ca28f 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -30,7 +30,8 @@ public:
     // caller must delete
     OpenGLTexture* getOpenGLTexture();
 
-    virtual bool copyToTexture(Texture& aTexture) override;
+    /// Copy bitmap data to the texture. Texture must be initialized and the correct size to hold the bitmap.
+    bool copyToTexture(Texture& aTexture);
 
     struct Texture;
 };
diff --git a/vcl/inc/opengl/win/winlayout.hxx b/vcl/inc/opengl/win/winlayout.hxx
index 24c2fc296b2c..cb6449fbd7bc 100644
--- a/vcl/inc/opengl/win/winlayout.hxx
+++ b/vcl/inc/opengl/win/winlayout.hxx
@@ -32,7 +32,7 @@ struct OpenGLGlobalWinGlyphCache : public GlobalWinGlyphCache
 
     PackedTextureAtlasManager maPackedTextureAtlas;
 
-    virtual bool AllocateTexture(WinGlyphDrawElement& rElement, int nWidth, int nHeight) override;
+    virtual bool AllocateTexture(WinGlyphDrawElement& rElement, CompatibleDC* dc) override;
     virtual void Prune() override;
 };