update to skia m129

Change-Id: Iea920a34b11695aba32f15921018cf53f418d09a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174846
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 101 insertions, 47 deletions

diff --git a/external/skia/make-api-visible.patch.1 b/external/skia/make-api-visible.patch.1
index f8bf5d5debbb..776f987a60f6 100644
--- a/external/skia/make-api-visible.patch.1
+++ b/external/skia/make-api-visible.patch.1
@@ -1,57 +1,123 @@
-diff -ur skia.org/tools/window/mac/WindowContextFactory_mac.h skia/tools/window/mac/WindowContextFactory_mac.h
---- skia.org/tools/window/mac/WindowContextFactory_mac.h	2024-10-04 14:26:29.787526193 +0200
-+++ skia/tools/window/mac/WindowContextFactory_mac.h	2024-10-04 14:28:08.353196733 +0200
-@@ -53,7 +53,7 @@
- #endif
+diff -ur skia.org/tools/window/WindowContext.h skia/tools/window/WindowContext.h
+--- skia.org/tools/window/WindowContext.h	2024-10-12 15:57:21
++++ skia/tools/window/WindowContext.h	2024-10-12 15:58:48
+@@ -23,7 +23,7 @@
+
+ namespace skwindow {
+
+-class WindowContext {
++class SK_API WindowContext {
+ public:
+     WindowContext(const DisplayParams&);
+
+diff -ur skia.org/tools/window/mac/GaneshMetalWindowContext_mac.h skia/tools/window/mac/GaneshMetalWindowContext_mac.h
+--- skia.org/tools/window/mac/GaneshMetalWindowContext_mac.h	2024-10-12 15:57:21
++++ skia/tools/window/mac/GaneshMetalWindowContext_mac.h	2024-10-12 15:59:18
+@@ -8,6 +8,7 @@
+ #ifndef GaneshMetalWindowContext_mac_DEFINED
+ #define GaneshMetalWindowContext_mac_DEFINED
+
++#include "include/private/base/SkAPI.h"
+ #include <memory>
+
+ namespace skwindow {
+@@ -15,7 +16,7 @@
+ struct DisplayParams;
+ struct MacWindowInfo;
+
+-std::unique_ptr<WindowContext> MakeGaneshMetalForMac(const MacWindowInfo&, const DisplayParams&);
++SK_API std::unique_ptr<WindowContext> MakeGaneshMetalForMac(const MacWindowInfo&, const DisplayParams&);
+ }  // namespace skwindow
 
- #ifdef SK_METAL
--std::unique_ptr<WindowContext> MakeMetalForMac(const MacWindowInfo&, const DisplayParams&);
-+SK_API std::unique_ptr<WindowContext> MakeMetalForMac(const MacWindowInfo&, const DisplayParams&);
- #if defined(SK_GRAPHITE)
- std::unique_ptr<WindowContext> MakeGraphiteMetalForMac(const MacWindowInfo&, const DisplayParams&);
  #endif
-diff -ur skia.org/tools/window/unix/WindowContextFactory_unix.h skia/tools/window/unix/WindowContextFactory_unix.h
---- skia.org/tools/window/unix/WindowContextFactory_unix.h	2024-10-04 14:26:29.787526193 +0200
-+++ skia/tools/window/unix/WindowContextFactory_unix.h	2024-10-04 14:29:16.184625681 +0200
-@@ -35,7 +35,7 @@
- };
+diff -ur skia.org/tools/window/unix/GaneshGLWindowContext_unix.h skia/tools/window/unix/GaneshGLWindowContext_unix.h
+--- skia.org/tools/window/unix/GaneshGLWindowContext_unix.h	2024-10-12 15:57:21
++++ skia/tools/window/unix/GaneshGLWindowContext_unix.h	2024-10-12 15:59:44
+@@ -8,6 +8,7 @@
+ #ifndef GaneshGLWindowContext_unix_DEFINED
+ #define GaneshGLWindowContext_unix_DEFINED
+
++#include "include/private/base/SkAPI.h"
+ #include <memory>
+
+ namespace skwindow {
+@@ -15,7 +16,7 @@
+ struct DisplayParams;
+ struct XlibWindowInfo;
+
+-std::unique_ptr<WindowContext> MakeGaneshGLForXlib(const XlibWindowInfo&, const DisplayParams&);
++SK_API std::unique_ptr<WindowContext> MakeGaneshGLForXlib(const XlibWindowInfo&, const DisplayParams&);
+ }  // namespace skwindow
 
- #ifdef SK_VULKAN
--std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
-+SK_API std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
- #if defined(SK_GRAPHITE)
- std::unique_ptr<WindowContext> MakeGraphiteVulkanForXlib(const XlibWindowInfo&,
-                                                          const DisplayParams&);
-@@ -43,11 +43,11 @@
  #endif
+diff -ur skia.org/tools/window/unix/GaneshVulkanWindowContext_unix.h skia/tools/window/unix/GaneshVulkanWindowContext_unix.h
+--- skia.org/tools/window/unix/GaneshVulkanWindowContext_unix.h	2024-10-12 15:57:21
++++ skia/tools/window/unix/GaneshVulkanWindowContext_unix.h	2024-10-12 15:58:48
+@@ -8,6 +8,7 @@
+ #ifndef GaneshVulkanWindowContext_unix_DEFINED
+ #define GaneshVulkanWindowContext_unix_DEFINED
+
++#include "include/private/base/SkAPI.h"
+ #include <memory>
+
+ namespace skwindow {
+@@ -15,7 +16,7 @@
+ struct DisplayParams;
+ struct XlibWindowInfo;
+
+-std::unique_ptr<WindowContext> MakeGaneshVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
++SK_API std::unique_ptr<WindowContext> MakeGaneshVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
+ }  // namespace skwindow
 
- #ifdef SK_GL
--std::unique_ptr<WindowContext> MakeGLForXlib(const XlibWindowInfo&, const DisplayParams&);
-+SK_API std::unique_ptr<WindowContext> MakeGLForXlib(const XlibWindowInfo&, const DisplayParams&);
  #endif
+diff -ur skia.org/tools/window/unix/GraphiteDawnVulkanWindowContext_unix.h skia/tools/window/unix/GraphiteDawnVulkanWindowContext_unix.h
+--- skia.org/tools/window/unix/GraphiteDawnVulkanWindowContext_unix.h	2024-10-12 15:57:21
++++ skia/tools/window/unix/GraphiteDawnVulkanWindowContext_unix.h	2024-10-12 15:58:48
+@@ -8,6 +8,7 @@
+ #ifndef GraphiteDawnVulkanWindowContext_unix_DEFINED
+ #define GraphiteDawnVulkanWindowContext_unix_DEFINED
+
++#include "include/private/base/SkAPI.h"
+ #include <memory>
+
+ namespace skwindow {
+@@ -15,7 +16,7 @@
+ struct DisplayParams;
+ struct XlibWindowInfo;
 
- #if defined(SK_DAWN) && defined(SK_GRAPHITE)
 -std::unique_ptr<WindowContext> MakeGraphiteDawnVulkanForXlib(const XlibWindowInfo&,
 +SK_API std::unique_ptr<WindowContext> MakeGraphiteDawnVulkanForXlib(const XlibWindowInfo&,
                                                               const DisplayParams&);
- #endif
+ }  // namespace skwindow
 
-@@ -55,7 +55,7 @@
-                                                              const DisplayParams&);
- #endif
+diff -ur skia.org/tools/window/unix/RasterWindowContext_unix.h skia/tools/window/unix/RasterWindowContext_unix.h
+--- skia.org/tools/window/unix/RasterWindowContext_unix.h	2024-10-12 15:57:21
++++ skia/tools/window/unix/RasterWindowContext_unix.h	2024-10-12 15:58:48
+@@ -8,6 +8,7 @@
+ #ifndef RasterWindowContext_unix_DEFINED
+ #define RasterWindowContext_unix_DEFINED
+
++#include "include/private/base/SkAPI.h"
+ #include <memory>
+
+ namespace skwindow {
+@@ -15,7 +16,7 @@
+ struct DisplayParams;
+ struct XlibWindowInfo;
 
 -std::unique_ptr<WindowContext> MakeRasterForXlib(const XlibWindowInfo&, const DisplayParams&);
 +SK_API std::unique_ptr<WindowContext> MakeRasterForXlib(const XlibWindowInfo&, const DisplayParams&);
-
  }  // namespace skwindow
 
+ #endif
 diff -ur skia.org/tools/window/win/WindowContextFactory_win.h skia/tools/window/win/WindowContextFactory_win.h
---- skia.org/tools/window/win/WindowContextFactory_win.h	2024-10-04 14:26:29.787526193 +0200
-+++ skia/tools/window/win/WindowContextFactory_win.h	2024-10-04 14:30:25.346039651 +0200
-@@ -13,28 +13,30 @@
+--- skia.org/tools/window/win/WindowContextFactory_win.h	2024-10-12 15:57:21
++++ skia/tools/window/win/WindowContextFactory_win.h	2024-10-12 16:00:18
+@@ -13,28 +13,31 @@
 
  #include <memory>
 
++#include "include/private/base/SkAPI.h"
 +#include "include/core/SkTypes.h"
 +
  namespace skwindow {
@@ -83,7 +149,7 @@ diff -ur skia.org/tools/window/win/WindowContextFactory_win.h skia/tools/window/
  #endif
 
  #ifdef SK_DAWN
-@@ -44,7 +46,7 @@
+@@ -43,7 +46,7 @@
  #endif
  #endif
 
@@ -92,15 +158,3 @@ diff -ur skia.org/tools/window/win/WindowContextFactory_win.h skia/tools/window/
 
  }  // namespace skwindow
 
-diff -ur skia.org/tools/window/WindowContext.h skia/tools/window/WindowContext.h
---- skia.org/tools/window/WindowContext.h	2024-10-04 14:26:29.787526193 +0200
-+++ skia/tools/window/WindowContext.h	2024-10-04 14:27:39.148004258 +0200
-@@ -23,7 +23,7 @@
-
- namespace skwindow {
-
--class WindowContext {
-+class SK_API WindowContext {
- public:
-     WindowContext(const DisplayParams&);
-