diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-10-05 19:15:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-10-06 21:06:40 +0200 |
| commit | 4e9a21bb0e4981e834de22c1d666f7a83a2771c5 (patch) | |
| tree | ec61e4b7a37595c9ddf287120943028a8089ec48 /vcl/inc/skia | |
| parent | 921f677cdbf05f184bc942b91af933dc2e283862 (diff) | |
Update to skia m116
The sort comparison patch seems to have been upstreamed.
Lots of patches needed to be redone.
Followed the skia release notes in replacing calls
to SkCanvas::flush and SkSurface::flushAndSubmit.
Change-Id: I13179565b95cc0720b4548cd4baecc5adacc7133
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174554
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Diffstat (limited to 'vcl/inc/skia')
| -rw-r--r-- | vcl/inc/skia/gdiimpl.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/skia/utils.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/skia/x11/gdiimpl.hxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx index 0cd1a61b3ced..88d066aaafdb 100644 --- a/vcl/inc/skia/gdiimpl.hxx +++ b/vcl/inc/skia/gdiimpl.hxx @@ -348,7 +348,7 @@ protected: // The Skia surface that is target of all the rendering. sk_sp<SkSurface> mSurface; // Note that mSurface may be a proxy surface and not the one from the window context. - std::unique_ptr<sk_app::WindowContext> mWindowContext; + std::unique_ptr<skwindow::WindowContext> mWindowContext; bool mIsGPU; // whether the surface is GPU-backed // Note that we generally use VCL coordinates, which is not mSurface coordinates if mScaling!=1. SkIRect mDirtyRect; // The area that has been changed since the last performFlush(). diff --git a/vcl/inc/skia/utils.hxx b/vcl/inc/skia/utils.hxx index 3ff966114b27..37aedfb2165a 100644 --- a/vcl/inc/skia/utils.hxx +++ b/vcl/inc/skia/utils.hxx @@ -39,7 +39,7 @@ #pragma GCC diagnostic ignored "-Wattributes" #pragma GCC diagnostic ignored "-Wshadow" #endif -#include <tools/sk_app/WindowContext.h> +#include <tools/window/WindowContext.h> #if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic pop #endif @@ -123,7 +123,7 @@ void setBlenderXor(SkPaint* paint); // Must be called in any VCL backend before any Skia functionality is used. // If not set, Skia will be disabled. VCL_DLLPUBLIC void - prepareSkia(std::unique_ptr<sk_app::WindowContext> (*createGpuWindowContext)(bool)); + prepareSkia(std::unique_ptr<skwindow::WindowContext> (*createGpuWindowContext)(bool)); // Shared cache of images. void addCachedImage(const OString& key, sk_sp<SkImage> image); diff --git a/vcl/inc/skia/x11/gdiimpl.hxx b/vcl/inc/skia/x11/gdiimpl.hxx index 849e81d9858b..f864d51a000a 100644 --- a/vcl/inc/skia/x11/gdiimpl.hxx +++ b/vcl/inc/skia/x11/gdiimpl.hxx @@ -33,10 +33,10 @@ public: private: virtual void createWindowSurfaceInternal(bool forceRaster = false) override; virtual bool avoidRecreateByResize() const override; - static std::unique_ptr<sk_app::WindowContext> + static std::unique_ptr<skwindow::WindowContext> createWindowContext(Display* display, Drawable drawable, const XVisualInfo* visual, int width, int height, SkiaHelper::RenderMethod renderMethod, bool temporary); - friend std::unique_ptr<sk_app::WindowContext> createVulkanWindowContext(bool); + friend std::unique_ptr<skwindow::WindowContext> createVulkanWindowContext(bool); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |