update to Skia chrome/m84 snapshot

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

5 files changed, 60 insertions, 17 deletions

diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 96566b958a7c..62fdeffed46e 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -205,6 +205,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkLocalMatrixImageFilter \
     UnpackedTarball/skia/src/core/SkMalloc \
     UnpackedTarball/skia/src/core/SkMallocPixelRef \
+    UnpackedTarball/skia/src/core/SkMarkerStack \
     UnpackedTarball/skia/src/core/SkMaskBlurFilter \
     UnpackedTarball/skia/src/core/SkMaskCache \
     UnpackedTarball/skia/src/core/SkMask \
@@ -418,6 +419,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/sksl/ir/SkSLType \
     UnpackedTarball/skia/src/sksl/ir/SkSLVariableReference \
     UnpackedTarball/skia/src/sksl/SkSLASTNode \
+    UnpackedTarball/skia/src/sksl/SkSLByteCode \
     UnpackedTarball/skia/src/sksl/SkSLByteCodeGenerator \
     UnpackedTarball/skia/src/sksl/SkSLCFGGenerator \
     UnpackedTarball/skia/src/sksl/SkSLCompiler \
@@ -431,6 +433,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/sksl/SkSLOutputStream \
     UnpackedTarball/skia/src/sksl/SkSLParser \
     UnpackedTarball/skia/src/sksl/SkSLPipelineStageCodeGenerator \
+    UnpackedTarball/skia/src/sksl/SkSLSampleMatrix \
     UnpackedTarball/skia/src/sksl/SkSLSPIRVCodeGenerator \
     UnpackedTarball/skia/src/sksl/SkSLSPIRVtoHLSL \
     UnpackedTarball/skia/src/sksl/SkSLSectionAndParameterHelper \
@@ -443,9 +446,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/utils/SkDashPath \
     UnpackedTarball/skia/src/utils/SkEventTracer \
     UnpackedTarball/skia/src/utils/SkFloatToDecimal \
-    UnpackedTarball/skia/src/utils/SkFrontBufferedStream \
     UnpackedTarball/skia/src/utils/SkCharToGlyphCache \
     UnpackedTarball/skia/src/utils/SkClipStackUtils \
+    UnpackedTarball/skia/src/utils/SkCustomTypeface \
     UnpackedTarball/skia/src/utils/SkInterpolator \
     UnpackedTarball/skia/src/utils/SkJSON \
     UnpackedTarball/skia/src/utils/SkJSONWriter \
@@ -510,6 +513,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/effects/generated/GrHSLToRGBFilterEffect \
     UnpackedTarball/skia/src/gpu/effects/generated/GrLumaColorFilterEffect \
     UnpackedTarball/skia/src/gpu/effects/generated/GrMagnifierEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrMatrixEffect \
     UnpackedTarball/skia/src/gpu/effects/generated/GrMixerEffect \
     UnpackedTarball/skia/src/gpu/effects/generated/GrOverrideInputFragmentProcessor \
     UnpackedTarball/skia/src/gpu/effects/generated/GrPremulInputFragmentProcessor \
@@ -531,7 +535,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/effects/GrRRectEffect \
     UnpackedTarball/skia/src/gpu/effects/GrShadowGeoProc \
     UnpackedTarball/skia/src/gpu/effects/GrSkSLFP \
-    UnpackedTarball/skia/src/gpu/effects/GrTextureDomain \
     UnpackedTarball/skia/src/gpu/effects/GrTextureEffect \
     UnpackedTarball/skia/src/gpu/effects/GrXfermodeFragmentProcessor \
     UnpackedTarball/skia/src/gpu/effects/GrYUVtoRGBEffect \
@@ -539,6 +542,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/geometry/GrQuad \
     UnpackedTarball/skia/src/gpu/geometry/GrQuadUtils \
     UnpackedTarball/skia/src/gpu/geometry/GrShape \
+    UnpackedTarball/skia/src/gpu/geometry/GrStyledShape \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLBlend \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSL \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLFragmentProcessor \
@@ -548,6 +552,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLProgramBuilder \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLProgramDataManager \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLShaderBuilder \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLUniformHandler \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLVarying \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLXferProcessor \
@@ -591,6 +596,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/GrDrawOpTest \
     UnpackedTarball/skia/src/gpu/GrDriverBugWorkarounds \
     UnpackedTarball/skia/src/gpu/GrDynamicAtlas \
+    UnpackedTarball/skia/src/gpu/GrFinishCallbacks \
     UnpackedTarball/skia/src/gpu/GrFixedClip \
     UnpackedTarball/skia/src/gpu/GrFragmentProcessor \
     UnpackedTarball/skia/src/gpu/GrGpu \
@@ -635,7 +641,11 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/GrShaderUtils \
     UnpackedTarball/skia/src/gpu/GrShaderVar \
     UnpackedTarball/skia/src/gpu/GrSoftwarePathRenderer \
+    UnpackedTarball/skia/src/gpu/GrSPIRVUniformHandler \
+    UnpackedTarball/skia/src/gpu/GrSPIRVVaryingHandler \
+    UnpackedTarball/skia/src/gpu/GrStagingBuffer \
     UnpackedTarball/skia/src/gpu/GrStencilAttachment \
+    UnpackedTarball/skia/src/gpu/GrStencilMaskHelper \
     UnpackedTarball/skia/src/gpu/GrStencilSettings \
     UnpackedTarball/skia/src/gpu/GrStyle \
     UnpackedTarball/skia/src/gpu/GrSurfaceContext \
@@ -695,7 +705,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/SkGr \
     UnpackedTarball/skia/src/gpu/tessellate/GrDrawAtlasPathOp \
     UnpackedTarball/skia/src/gpu/tessellate/GrFillPathShader \
-    UnpackedTarball/skia/src/gpu/tessellate/GrPathParser \
     UnpackedTarball/skia/src/gpu/tessellate/GrStencilPathShader \
     UnpackedTarball/skia/src/gpu/tessellate/GrTessellatePathOp \
     UnpackedTarball/skia/src/gpu/tessellate/GrTessellationPathRenderer \
@@ -723,9 +732,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/vk/GrVkGpu \
     UnpackedTarball/skia/src/gpu/vk/GrVkImage \
     UnpackedTarball/skia/src/gpu/vk/GrVkImageView \
-    UnpackedTarball/skia/src/gpu/vk/GrVkIndexBuffer \
     UnpackedTarball/skia/src/gpu/vk/GrVkInterface \
     UnpackedTarball/skia/src/gpu/vk/GrVkMemory \
+    UnpackedTarball/skia/src/gpu/vk/GrVkMeshBuffer \
     UnpackedTarball/skia/src/gpu/vk/GrVkOpsRenderPass \
     UnpackedTarball/skia/src/gpu/vk/GrVkPipeline \
     UnpackedTarball/skia/src/gpu/vk/GrVkPipelineStateBuilder \
@@ -748,7 +757,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/vk/GrVkUniformHandler \
     UnpackedTarball/skia/src/gpu/vk/GrVkUtil \
     UnpackedTarball/skia/src/gpu/vk/GrVkVaryingHandler \
-    UnpackedTarball/skia/src/gpu/vk/GrVkVertexBuffer \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
@@ -778,6 +786,13 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/opts/SkOpts_crc32 \
 ))
 
+# This one needs to #define some things before #include <immintrin.h>, but the header would get introduced
+# already by the PCH. Add a dummy flag to avoid PCH use.
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/core/SkOpts_skx, \
+    -DDUMMY_AVOID_PCH=1 \
+))
+
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/tools/gpu/vk/VkTestUtils \
     UnpackedTarball/skia/tools/sk_app/VulkanWindowContext \
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk
index 08769b2867a5..c4a248610ce4 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -35,6 +35,7 @@ skia_patches := \
     extend-rgb-to-rgba.patch.0 \
     windows-typeface-directwrite.patch.0 \
     windows-raster-surface-no-copies.patch.1 \
+    fix-windows-dwrite.patch.1 \
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
 
diff --git a/external/skia/fix-alpha-difference-copy.patch.1 b/external/skia/fix-alpha-difference-copy.patch.1
index 5a08d092e5d3..61a61e621fbd 100644
--- a/external/skia/fix-alpha-difference-copy.patch.1
+++ b/external/skia/fix-alpha-difference-copy.patch.1
@@ -1,9 +1,9 @@
 diff --git a/src/core/SkBlitter_Sprite.cpp b/src/core/SkBlitter_Sprite.cpp
-index 6ae7893681..3878eb3b81 100644
+index df7d9a7025..7f94c2a660 100644
 --- a/src/core/SkBlitter_Sprite.cpp
 +++ b/src/core/SkBlitter_Sprite.cpp
-@@ -179,7 +179,7 @@ SkBlitter* SkBlitter::ChooseSprite(const SkPixmap& dst, const SkPaint& paint,
-     SkASSERT(alloc != nullptr);
+@@ -191,7 +191,7 @@ SkBlitter* SkBlitter::ChooseSprite(const SkPixmap& dst, const SkPaint& paint,
+     }
  
      // TODO: in principle SkRasterPipelineSpriteBlitter could be made to handle this.
 -    if (source.alphaType() == kUnpremul_SkAlphaType) {
diff --git a/external/skia/fix-windows-dwrite.patch.1 b/external/skia/fix-windows-dwrite.patch.1
new file mode 100644
index 000000000000..482fa8b40411
--- /dev/null
+++ b/external/skia/fix-windows-dwrite.patch.1
@@ -0,0 +1,20 @@
+diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp
+index 6a4748f91c..50086a7780 100644
+--- a/src/ports/SkFontMgr_win_dw.cpp
++++ b/src/ports/SkFontMgr_win_dw.cpp
+@@ -361,6 +361,7 @@ static bool FindByDWriteFont(SkTypeface* cached, void* ctx) {
+     DWriteFontTypeface* cshFace = reinterpret_cast<DWriteFontTypeface*>(cached);
+     ProtoDWriteTypeface* ctxFace = reinterpret_cast<ProtoDWriteTypeface*>(ctx);
+ 
++#if defined(NTDDI_WIN10_RS3) && NTDDI_VERSION >= NTDDI_WIN10_RS3
+     // IDWriteFontFace5 introduced both Equals and HasVariations
+     SkTScopedComPtr<IDWriteFontFace5> cshFontFace5;
+     SkTScopedComPtr<IDWriteFontFace5> ctxFontFace5;
+@@ -369,6 +370,7 @@ static bool FindByDWriteFont(SkTypeface* cached, void* ctx) {
+     if (cshFontFace5 && ctxFontFace5) {
+         return cshFontFace5->Equals(ctxFontFace5.get());
+     }
++#endif
+ 
+     bool same;
+ 
diff --git a/external/skia/inc/pch/precompiled_skia.hxx b/external/skia/inc/pch/precompiled_skia.hxx
index 8b82875fba89..e3d41a03f41a 100644
--- a/external/skia/inc/pch/precompiled_skia.hxx
+++ b/external/skia/inc/pch/precompiled_skia.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-04-06 12:59:34 using:
+ Generated on 2020-05-18 11:43:55 using:
  ./bin/update_pch external/skia skia --cutoff=1 --exclude:system --include:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -28,6 +28,7 @@
 #include <cctype>
 #include <cfloat>
 #include <chrono>
+#include <cinttypes>
 #include <climits>
 #include <cmath>
 #include <cstddef>
@@ -258,8 +259,8 @@
 #include <include/utils/SkBase64.h>
 #include <include/utils/SkCamera.h>
 #include <include/utils/SkCanvasStateUtils.h>
+#include <include/utils/SkCustomTypeface.h>
 #include <include/utils/SkEventTracer.h>
-#include <include/utils/SkFrontBufferedStream.h>
 #include <include/utils/SkInterpolator.h>
 #include <include/utils/SkNWayCanvas.h>
 #include <include/utils/SkNoDrawCanvas.h>
@@ -315,7 +316,6 @@
 #include <src/core/SkBlurPriv.h>
 #include <src/core/SkBuffer.h>
 #include <src/core/SkCachedData.h>
-#include <src/core/SkCanvasMatrix.h>
 #include <src/core/SkCanvasPriv.h>
 #include <src/core/SkClipOpPriv.h>
 #include <src/core/SkClipStack.h>
@@ -343,7 +343,6 @@
 #include <src/core/SkEffectPriv.h>
 #include <src/core/SkEndian.h>
 #include <src/core/SkEnumerate.h>
-#include <src/core/SkExchange.h>
 #include <src/core/SkFDot6.h>
 #include <src/core/SkFontDescriptor.h>
 #include <src/core/SkFontPriv.h>
@@ -369,6 +368,7 @@
 #include <src/core/SkLocalMatrixImageFilter.h>
 #include <src/core/SkMD5.h>
 #include <src/core/SkMSAN.h>
+#include <src/core/SkMarkerStack.h>
 #include <src/core/SkMask.h>
 #include <src/core/SkMaskBlurFilter.h>
 #include <src/core/SkMaskCache.h>
@@ -377,6 +377,7 @@
 #include <src/core/SkMathPriv.h>
 #include <src/core/SkMatrixImageFilter.h>
 #include <src/core/SkMatrixPriv.h>
+#include <src/core/SkMatrixProvider.h>
 #include <src/core/SkMatrixUtils.h>
 #include <src/core/SkMessageBus.h>
 #include <src/core/SkMiniRecorder.h>
@@ -509,6 +510,7 @@
 #include <src/gpu/GrDynamicAtlas.h>
 #include <src/gpu/GrEagerVertexAllocator.h>
 #include <src/gpu/GrFPArgs.h>
+#include <src/gpu/GrFinishCallbacks.h>
 #include <src/gpu/GrFixedClip.h>
 #include <src/gpu/GrFragmentProcessor.h>
 #include <src/gpu/GrGeometryProcessor.h>
@@ -558,6 +560,8 @@
 #include <src/gpu/GrResourceCache.h>
 #include <src/gpu/GrResourceProvider.h>
 #include <src/gpu/GrResourceProviderPriv.h>
+#include <src/gpu/GrSPIRVUniformHandler.h>
+#include <src/gpu/GrSPIRVVaryingHandler.h>
 #include <src/gpu/GrSWMaskHelper.h>
 #include <src/gpu/GrSamplePatternDictionary.h>
 #include <src/gpu/GrSamplerState.h>
@@ -567,8 +571,10 @@
 #include <src/gpu/GrShaderVar.h>
 #include <src/gpu/GrSimpleMesh.h>
 #include <src/gpu/GrSoftwarePathRenderer.h>
+#include <src/gpu/GrStagingBuffer.h>
 #include <src/gpu/GrStencilAttachment.h>
 #include <src/gpu/GrStencilClip.h>
+#include <src/gpu/GrStencilMaskHelper.h>
 #include <src/gpu/GrStencilSettings.h>
 #include <src/gpu/GrStyle.h>
 #include <src/gpu/GrSurface.h>
@@ -640,7 +646,6 @@
 #include <src/gpu/effects/GrRRectEffect.h>
 #include <src/gpu/effects/GrShadowGeoProc.h>
 #include <src/gpu/effects/GrSkSLFP.h>
-#include <src/gpu/effects/GrTextureDomain.h>
 #include <src/gpu/effects/GrTextureEffect.h>
 #include <src/gpu/effects/GrXfermodeFragmentProcessor.h>
 #include <src/gpu/effects/GrYUVtoRGBEffect.h>
@@ -659,6 +664,7 @@
 #include <src/gpu/effects/generated/GrHSLToRGBFilterEffect.h>
 #include <src/gpu/effects/generated/GrLumaColorFilterEffect.h>
 #include <src/gpu/effects/generated/GrMagnifierEffect.h>
+#include <src/gpu/effects/generated/GrMatrixEffect.h>
 #include <src/gpu/effects/generated/GrMixerEffect.h>
 #include <src/gpu/effects/generated/GrOverrideInputFragmentProcessor.h>
 #include <src/gpu/effects/generated/GrPremulInputFragmentProcessor.h>
@@ -671,6 +677,7 @@
 #include <src/gpu/geometry/GrQuadUtils.h>
 #include <src/gpu/geometry/GrRect.h>
 #include <src/gpu/geometry/GrShape.h>
+#include <src/gpu/geometry/GrStyledShape.h>
 #include <src/gpu/gl/GrGLGpu.h>
 #include <src/gpu/gl/GrGLTexture.h>
 #include <src/gpu/gl/GrGLUtil.h>
@@ -740,7 +747,8 @@
 #include <src/gpu/ops/GrTriangulatingPathRenderer.h>
 #include <src/gpu/tessellate/GrDrawAtlasPathOp.h>
 #include <src/gpu/tessellate/GrFillPathShader.h>
-#include <src/gpu/tessellate/GrPathParser.h>
+#include <src/gpu/tessellate/GrMiddleOutPolygonTriangulator.h>
+#include <src/gpu/tessellate/GrMidpointContourParser.h>
 #include <src/gpu/tessellate/GrStencilPathShader.h>
 #include <src/gpu/tessellate/GrTessellatePathOp.h>
 #include <src/gpu/tessellate/GrTessellationPathRenderer.h>
@@ -764,9 +772,9 @@
 #include <src/gpu/vk/GrVkImage.h>
 #include <src/gpu/vk/GrVkImageLayout.h>
 #include <src/gpu/vk/GrVkImageView.h>
-#include <src/gpu/vk/GrVkIndexBuffer.h>
 #include <src/gpu/vk/GrVkInterface.h>
 #include <src/gpu/vk/GrVkMemory.h>
+#include <src/gpu/vk/GrVkMeshBuffer.h>
 #include <src/gpu/vk/GrVkOpsRenderPass.h>
 #include <src/gpu/vk/GrVkPipeline.h>
 #include <src/gpu/vk/GrVkPipelineState.h>
@@ -787,7 +795,6 @@
 #include <src/gpu/vk/GrVkUniformHandler.h>
 #include <src/gpu/vk/GrVkUtil.h>
 #include <src/gpu/vk/GrVkVaryingHandler.h>
-#include <src/gpu/vk/GrVkVertexBuffer.h>
 #include <src/image/SkImage_Base.h>
 #include <src/image/SkImage_Gpu.h>
 #include <src/image/SkImage_GpuBase.h>
@@ -856,7 +863,6 @@
 #include <src/sksl/SkSLGLSLCodeGenerator.h>
 #include <src/sksl/SkSLHCodeGenerator.h>
 #include <src/sksl/SkSLIRGenerator.h>
-#include <src/sksl/SkSLInterpreter.h>
 #include <src/sksl/SkSLLexer.h>
 #include <src/sksl/SkSLMetalCodeGenerator.h>
 #include <src/sksl/SkSLOutputStream.h>
@@ -864,6 +870,7 @@
 #include <src/sksl/SkSLPipelineStageCodeGenerator.h>
 #include <src/sksl/SkSLSPIRVCodeGenerator.h>
 #include <src/sksl/SkSLSPIRVtoHLSL.h>
+#include <src/sksl/SkSLSampleMatrix.h>
 #include <src/sksl/SkSLSectionAndParameterHelper.h>
 #include <src/sksl/SkSLString.h>
 #include <src/sksl/SkSLStringStream.h>