update Skia to chrome/m103

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

1 files changed, 33 insertions, 46 deletions

diff --git a/external/skia/fix-pch.patch.1 b/external/skia/fix-pch.patch.1
index 3331d54cfe2c..a2fe81562720 100644
--- a/external/skia/fix-pch.patch.1
+++ b/external/skia/fix-pch.patch.1
@@ -1,5 +1,5 @@
 diff --git a/include/core/SkColor.h b/include/core/SkColor.h
-index 9cba771ddd..6d324b75d0 100644
+index a6e63def23..1c0655c3d7 100644
 --- a/include/core/SkColor.h
 +++ b/include/core/SkColor.h
 @@ -420,6 +420,7 @@ using SkColor4f = SkRGBA4f<kUnpremul_SkAlphaType>;
@@ -11,10 +11,10 @@ index 9cba771ddd..6d324b75d0 100644
  namespace SkColors {
  constexpr SkColor4f kTransparent = {0, 0, 0, 0};
 diff --git a/include/private/SkColorData.h b/include/private/SkColorData.h
-index aba610eacf..792da4e9fb 100644
+index a59e7b0446..960b4c0313 100644
 --- a/include/private/SkColorData.h
 +++ b/include/private/SkColorData.h
-@@ -442,4 +442,6 @@ constexpr SkPMColor4f SK_PMColor4fILLEGAL = { SK_FloatNegativeInfinity,
+@@ -438,4 +438,6 @@ constexpr SkPMColor4f SK_PMColor4fILLEGAL = { SK_FloatNegativeInfinity,
                                                SK_FloatNegativeInfinity,
                                                SK_FloatNegativeInfinity };
  
@@ -22,10 +22,10 @@ index aba610eacf..792da4e9fb 100644
 +
  #endif
 diff --git a/src/core/SkM44.cpp b/src/core/SkM44.cpp
-index 0cd138e6cc..ad7f7eca74 100644
+index 02b1741763..4cece999d2 100644
 --- a/src/core/SkM44.cpp
 +++ b/src/core/SkM44.cpp
-@@ -283,6 +283,8 @@ SkM44 SkM44::LookAt(const SkV3& eye, const SkV3& center, const SkV3& up) {
+@@ -341,6 +341,8 @@ SkM44 SkM44::LookAt(const SkV3& eye, const SkV3& center, const SkV3& up) {
      return m;
  }
  
@@ -34,31 +34,38 @@ index 0cd138e6cc..ad7f7eca74 100644
  SkM44 SkM44::Perspective(float near, float far, float angle) {
      SkASSERT(far > near);
  
-diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
-index afe3698f99..119ae41093 100644
---- a/src/gpu/gl/GrGLGpu.cpp
-+++ b/src/gpu/gl/GrGLGpu.cpp
-@@ -3536,6 +3536,8 @@ void GrGLGpu::xferBarrier(GrRenderTarget* rt, GrXferBarrierType type) {
-     }
- }
- 
-+#undef MemoryBarrier
-+
- void GrGLGpu::insertManualFramebufferBarrier() {
-     SkASSERT(this->caps()->requiresManualFBBarrierAfterTessellatedStencilDraw());
-     GL_CALL(MemoryBarrier(GR_GL_FRAMEBUFFER_BARRIER_BIT));
-diff --git a/src/gpu/vk/GrVkSemaphore.cpp b/src/gpu/vk/GrVkSemaphore.cpp
-index 23bf656bf8..f926ebfdc2 100644
---- a/src/gpu/vk/GrVkSemaphore.cpp
-+++ b/src/gpu/vk/GrVkSemaphore.cpp
+diff --git a/src/gpu/ganesh/vk/GrVkSemaphore.cpp b/src/gpu/ganesh/vk/GrVkSemaphore.cpp
+index 70c7f0ea80..ab8319a447 100644
+--- a/src/gpu/ganesh/vk/GrVkSemaphore.cpp
++++ b/src/gpu/ganesh/vk/GrVkSemaphore.cpp
 @@ -10,6 +10,7 @@
  #include "include/gpu/GrBackendSemaphore.h"
- #include "src/gpu/vk/GrVkGpu.h"
- #include "src/gpu/vk/GrVkUtil.h"
+ #include "src/gpu/ganesh/vk/GrVkGpu.h"
+ #include "src/gpu/ganesh/vk/GrVkUtil.h"
 +#include "tools/gpu/vk/GrVulkanDefines.h"
  
  #ifdef VK_USE_PLATFORM_WIN32_KHR
  // windows wants to define this as CreateSemaphoreA or CreateSemaphoreW
+diff --git a/src/sksl/ir/SkSLPoison.h b/src/sksl/ir/SkSLPoison.h
+index 035f94e1f6..3cf12db902 100644
+--- a/src/sksl/ir/SkSLPoison.h
++++ b/src/sksl/ir/SkSLPoison.h
+@@ -5,6 +5,9 @@
+  * found in the LICENSE file.
+  */
+ 
++#ifndef SKSL_POISON
++#define SKSL_POISON
++
+ #include "src/sksl/SkSLCompiler.h"
+ #include "src/sksl/SkSLContext.h"
+ 
+@@ -38,3 +41,5 @@ private:
+ };
+ 
+ } // namespace SkSL
++
++#endif
 diff --git a/src/utils/win/SkDWriteGeometrySink.h b/src/utils/win/SkDWriteGeometrySink.h
 index af4909aaaf..825ec35c83 100644
 --- a/src/utils/win/SkDWriteGeometrySink.h
@@ -73,7 +80,7 @@ index af4909aaaf..825ec35c83 100644
  #include <d2d1.h>
  
 diff --git a/third_party/skcms/skcms.cc b/third_party/skcms/skcms.cc
-index 33e3514253..af9313a958 100644
+index 1b643f45cf..c1981110da 100644
 --- a/third_party/skcms/skcms.cc
 +++ b/third_party/skcms/skcms.cc
 @@ -130,7 +130,8 @@ static float minus_1_ulp(float x) {
@@ -86,7 +93,7 @@ index 33e3514253..af9313a958 100644
  struct TF_PQish  { float A,B,C,D,E,F; };
  struct TF_HLGish { float R,G,a,b,c,K_minus_1; };
  // We didn't originally support a scale factor K for HLG, and instead just stored 0 in
-@@ -2061,7 +2062,9 @@ typedef enum {
+@@ -2318,7 +2319,9 @@ typedef enum {
      Op_store_hhhh,
      Op_store_fff,
      Op_store_ffff,
@@ -97,23 +104,3 @@ index 33e3514253..af9313a958 100644
  
  #if defined(__clang__)
      template <int N, typename T> using Vec = T __attribute__((ext_vector_type(N)));
-diff --git a/src/sksl/ir/SkSLPoison.h b/src/sksl/ir/SkSLPoison.h
-index 43e3a1c2bd..6f88251eea 100644
---- a/src/sksl/ir/SkSLPoison.h
-+++ b/src/sksl/ir/SkSLPoison.h
-@@ -5,6 +5,9 @@
-  * found in the LICENSE file.
-  */
- 
-+#ifndef SKSL_POISON
-+#define SKSL_POISON
-+
- #include "src/sksl/SkSLCompiler.h"
- #include "src/sksl/SkSLContext.h"
- 
-@@ -38,3 +41,5 @@ private:
- };
- 
- } // namespace SkSL
-+
-+#endif