summaryrefslogtreecommitdiff
path: root/vcl/inc/skia
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2019-10-15 16:17:26 +0200
committerLuboš Luňák <l.lunak@collabora.com>2019-11-27 09:55:08 +0100
commitb6cbf5dbd067c63f94872e31f2332e95edc201dd (patch)
treec169fd52f259038dca208c2bcc6904f38163fb1b /vcl/inc/skia
parent8fa83a3265e25b164cb11d598f1fbb49a7b8fbf1 (diff)
refactor Windows OpenGLGlyphCache stuff to be reusable for Skia
Basically just remove 'OpenGL' from names of most of the classes, turn them into base classes that have OpenGL subclasses that actually implement the functionality. Change-Id: Idf1f347cebc2a417bda37d6955201c775ecb0890
Diffstat (limited to 'vcl/inc/skia')
-rw-r--r--vcl/inc/skia/win/gdiimpl.hxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/vcl/inc/skia/win/gdiimpl.hxx b/vcl/inc/skia/win/gdiimpl.hxx
index 621d8d4b4a78..4c47f02baa95 100644
--- a/vcl/inc/skia/win/gdiimpl.hxx
+++ b/vcl/inc/skia/win/gdiimpl.hxx
@@ -15,6 +15,7 @@
#include <skia/gdiimpl.hxx>
#include <win/salgdi.h>
+#include <win/wingdiimpl.hxx>
class ControlCacheKey;
namespace sk_app
@@ -22,7 +23,7 @@ namespace sk_app
class WindowContext;
}
-class WinSkiaSalGraphicsImpl : public SkiaSalGraphicsImpl
+class WinSkiaSalGraphicsImpl : public SkiaSalGraphicsImpl, public WinSalGraphicsImplBase
{
private:
WinSalGraphics& mWinParent;
@@ -36,10 +37,11 @@ public:
virtual void freeResources() override;
- bool TryRenderCachedNativeControl(ControlCacheKey const& rControlCacheKey, int nX, int nY);
+ virtual bool TryRenderCachedNativeControl(ControlCacheKey const& rControlCacheKey, int nX,
+ int nY) override;
- bool RenderAndCacheNativeControl(OpenGLCompatibleDC& rWhite, OpenGLCompatibleDC& rBlack, int nX,
- int nY, ControlCacheKey& aControlCacheKey);
+ virtual bool RenderAndCacheNativeControl(CompatibleDC& rWhite, CompatibleDC& rBlack, int nX,
+ int nY, ControlCacheKey& aControlCacheKey) override;
protected:
virtual void createSurface() override;