From 1e609d1c5afb0188dd8c2b211fb405627303bef4 Mon Sep 17 00:00:00 2001
From: Luboš Luňák <l.lunak@collabora.com>
Date: Tue, 17 Mar 2020 20:45:04 +0100
Subject: update Skia to chrome/m82
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also don't build pdf and jpeg support, it's not needed.

Change-Id: I5f10b1279072dbaba7695aecba5e415853ae308b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90666
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
---
 external/skia/Library_skia.mk                    | 134 ++---------------------
 external/skia/UnpackedTarball_skia.mk            |   1 +
 external/skia/clang-attributes-warning.patch.1   |  31 ++++++
 external/skia/fix-alpha-difference-copy.patch.1  |   2 +-
 external/skia/fix-pch.patch.1                    |  14 ---
 external/skia/inc/pch/precompiled_skia.hxx       |  65 +++--------
 external/skia/no-trace-resources-on-exit.patch.1 |  12 +-
 7 files changed, 66 insertions(+), 193 deletions(-)
 create mode 100644 external/skia/clang-attributes-warning.patch.1

(limited to 'external/skia')

diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 1325f8180c99..a86c415339d3 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_externals,skia,\
 ))
 endif
 
+# we don't enable jpeg for skia, but it has incorrect #ifdef's in places
 $(eval $(call gb_Library_use_externals,skia,\
     zlib \
     libjpeg \
@@ -91,9 +92,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/codec/SkColorTable \
     UnpackedTarball/skia/src/codec/SkEncodedInfo \
     UnpackedTarball/skia/src/codec/SkIcoCodec \
-    UnpackedTarball/skia/src/codec/SkJpegCodec \
-    UnpackedTarball/skia/src/codec/SkJpegDecoderMgr \
-    UnpackedTarball/skia/src/codec/SkJpegUtility \
     UnpackedTarball/skia/src/codec/SkMasks \
     UnpackedTarball/skia/src/codec/SkMaskSwizzler \
     UnpackedTarball/skia/src/codec/SkParseEncodedOrigin \
@@ -174,6 +172,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkFontStream \
     UnpackedTarball/skia/src/core/SkGaussFilter \
     UnpackedTarball/skia/src/core/SkGeometry \
+    UnpackedTarball/skia/src/core/SkIDChangeListener \
     UnpackedTarball/skia/src/core/SkGlobalInitialization_core \
     UnpackedTarball/skia/src/core/SkGlyph \
     UnpackedTarball/skia/src/core/SkGlyphBuffer \
@@ -252,6 +251,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkRuntimeEffect \
     UnpackedTarball/skia/src/core/SkRWBuffer \
     UnpackedTarball/skia/src/core/SkScalar \
+    UnpackedTarball/skia/src/core/SkScalerCache \
     UnpackedTarball/skia/src/core/SkScalerContext \
     UnpackedTarball/skia/src/core/SkScan_AAAPath \
     UnpackedTarball/skia/src/core/SkScan_Antihair \
@@ -268,7 +268,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkSpriteBlitter_RGB565 \
     UnpackedTarball/skia/src/core/SkStream \
     UnpackedTarball/skia/src/core/SkStrikeCache \
-    UnpackedTarball/skia/src/core/SkStrike \
     UnpackedTarball/skia/src/core/SkStrikeForGPU \
     UnpackedTarball/skia/src/core/SkStrikeSpec \
     UnpackedTarball/skia/src/core/SkString \
@@ -283,7 +282,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkTextBlobTrace \
     UnpackedTarball/skia/src/core/SkThreadID \
     UnpackedTarball/skia/src/core/SkTime \
-    UnpackedTarball/skia/src/core/SkTLS \
     UnpackedTarball/skia/src/core/SkTSearch \
     UnpackedTarball/skia/src/core/SkTypefaceCache \
     UnpackedTarball/skia/src/core/SkTypeface \
@@ -351,8 +349,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/image/SkSurface \
     UnpackedTarball/skia/src/image/SkSurface_Raster \
     UnpackedTarball/skia/src/images/SkImageEncoder \
-    UnpackedTarball/skia/src/images/SkJpegEncoder \
-    UnpackedTarball/skia/src/images/SkJPEGWriteUtility \
     UnpackedTarball/skia/src/images/SkPngEncoder \
     UnpackedTarball/skia/src/images/SkWebpEncoder \
     UnpackedTarball/skia/src/lazy/SkDiscardableMemoryPool \
@@ -388,28 +384,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/pathops/SkPathOpsWinding \
     UnpackedTarball/skia/src/pathops/SkPathWriter \
     UnpackedTarball/skia/src/pathops/SkReduceOrder \
-    UnpackedTarball/skia/src/pdf/SkClusterator \
-    UnpackedTarball/skia/src/pdf/SkDeflate \
-    UnpackedTarball/skia/src/pdf/SkJpegInfo \
-    UnpackedTarball/skia/src/pdf/SkKeyedImage \
-    UnpackedTarball/skia/src/pdf/SkPDFBitmap \
-    UnpackedTarball/skia/src/pdf/SkPDFDevice \
-    UnpackedTarball/skia/src/pdf/SkPDFDocument \
-    UnpackedTarball/skia/src/pdf/SkPDFFont \
-    UnpackedTarball/skia/src/pdf/SkPDFFormXObject \
-    UnpackedTarball/skia/src/pdf/SkPDFGradientShader \
-    UnpackedTarball/skia/src/pdf/SkPDFGraphicStackState \
-    UnpackedTarball/skia/src/pdf/SkPDFGraphicState \
-    UnpackedTarball/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray \
-    UnpackedTarball/skia/src/pdf/SkPDFMakeToUnicodeCmap \
-    UnpackedTarball/skia/src/pdf/SkPDFMetadata \
-    UnpackedTarball/skia/src/pdf/SkPDFResourceDict \
-    UnpackedTarball/skia/src/pdf/SkPDFShader \
-    UnpackedTarball/skia/src/pdf/SkPDFSubsetFont \
-    UnpackedTarball/skia/src/pdf/SkPDFTag \
-    UnpackedTarball/skia/src/pdf/SkPDFTypes \
-    UnpackedTarball/skia/src/pdf/SkPDFType1Font \
-    UnpackedTarball/skia/src/pdf/SkPDFUtils \
     UnpackedTarball/skia/src/sfnt/SkOTTable_name \
     UnpackedTarball/skia/src/sfnt/SkOTUtils \
     UnpackedTarball/skia/src/shaders/gradients/SkGradientShader \
@@ -429,7 +403,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/shaders/SkLocalMatrixShader \
     UnpackedTarball/skia/src/shaders/SkPerlinNoiseShader \
     UnpackedTarball/skia/src/shaders/SkPictureShader \
-    UnpackedTarball/skia/src/shaders/SkRTShader \
     UnpackedTarball/skia/src/shaders/SkShader \
     UnpackedTarball/skia/src/sksl/ir/SkSLSetting \
     UnpackedTarball/skia/src/sksl/ir/SkSLSymbolTable \
@@ -450,6 +423,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/sksl/SkSLParser \
     UnpackedTarball/skia/src/sksl/SkSLPipelineStageCodeGenerator \
     UnpackedTarball/skia/src/sksl/SkSLSPIRVCodeGenerator \
+    UnpackedTarball/skia/src/sksl/SkSLSPIRVtoHLSL \
     UnpackedTarball/skia/src/sksl/SkSLSectionAndParameterHelper \
     UnpackedTarball/skia/src/sksl/SkSLString \
     UnpackedTarball/skia/src/sksl/SkSLUtil \
@@ -485,7 +459,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/utils/SkThreadUtils_win \
     UnpackedTarball/skia/src/utils/SkUTF \
     UnpackedTarball/skia/src/utils/SkWhitelistTypefaces \
-    UnpackedTarball/skia/src/utils/Sk3D \
     UnpackedTarball/skia/src/xps/SkXPSDevice \
     UnpackedTarball/skia/src/xps/SkXPSDocument \
 ))
@@ -525,6 +498,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/effects/generated/GrConfigConversionEffect \
     UnpackedTarball/skia/src/gpu/effects/generated/GrConstColorProcessor \
     UnpackedTarball/skia/src/gpu/effects/generated/GrEllipseEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrDeviceSpaceEffect \
     UnpackedTarball/skia/src/gpu/effects/generated/GrHSLToRGBFilterEffect \
     UnpackedTarball/skia/src/gpu/effects/generated/GrLumaColorFilterEffect \
     UnpackedTarball/skia/src/gpu/effects/generated/GrMagnifierEffect \
@@ -639,14 +613,16 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/GrDrawOpAtlas \
     UnpackedTarball/skia/src/gpu/GrDrawOpTest \
     UnpackedTarball/skia/src/gpu/GrDriverBugWorkarounds \
+    UnpackedTarball/skia/src/gpu/GrDynamicAtlas \
     UnpackedTarball/skia/src/gpu/GrFixedClip \
     UnpackedTarball/skia/src/gpu/GrFragmentProcessor \
-    UnpackedTarball/skia/src/gpu/GrGpuBuffer \
     UnpackedTarball/skia/src/gpu/GrGpu \
+    UnpackedTarball/skia/src/gpu/GrGpuBuffer \
     UnpackedTarball/skia/src/gpu/GrGpuResource \
     UnpackedTarball/skia/src/gpu/GrImageContext \
     UnpackedTarball/skia/src/gpu/GrImageTextureMaker \
     UnpackedTarball/skia/src/gpu/GrLegacyDirectContext \
+    UnpackedTarball/skia/src/gpu/GrManagedResource \
     UnpackedTarball/skia/src/gpu/GrMemoryPool \
     UnpackedTarball/skia/src/gpu/GrOnFlushResourceProvider \
     UnpackedTarball/skia/src/gpu/GrOpFlushState \
@@ -730,6 +706,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ops/GrRegionOp \
     UnpackedTarball/skia/src/gpu/ops/GrShadowRRectOp \
     UnpackedTarball/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper \
+    UnpackedTarball/skia/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil \
     UnpackedTarball/skia/src/gpu/ops/GrSmallPathRenderer \
     UnpackedTarball/skia/src/gpu/ops/GrStencilAndCoverPathRenderer \
     UnpackedTarball/skia/src/gpu/ops/GrStencilPathOp \
@@ -739,6 +716,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/SkGpuDevice \
     UnpackedTarball/skia/src/gpu/SkGpuDevice_drawTexture \
     UnpackedTarball/skia/src/gpu/SkGr \
+    UnpackedTarball/skia/src/gpu/tessellate/GrDrawAtlasPathOp \
     UnpackedTarball/skia/src/gpu/tessellate/GrFillPathShader \
     UnpackedTarball/skia/src/gpu/tessellate/GrGpuTessellationPathRenderer \
     UnpackedTarball/skia/src/gpu/tessellate/GrPathParser \
@@ -836,7 +814,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/ports/SkOSFile_win \
     UnpackedTarball/skia/src/ports/SkOSLibrary_win \
     UnpackedTarball/skia/src/ports/SkScalerContext_win_dw \
-    UnpackedTarball/skia/src/ports/SkTLS_win \
     UnpackedTarball/skia/src/ports/SkTypeface_win_dw \
     UnpackedTarball/skia/src/utils/win/SkAutoCoInitialize \
     UnpackedTarball/skia/src/utils/win/SkDWrite \
@@ -866,7 +843,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/ports/SkFontMgr_fontconfig_factory \
     UnpackedTarball/skia/src/ports/SkOSFile_posix \
     UnpackedTarball/skia/src/ports/SkOSLibrary_posix \
-    UnpackedTarball/skia/src/ports/SkTLS_pthread \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
@@ -876,96 +852,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
 ))
 endif
 
-
-#    UnpackedTarball/skia/src/android/SkAndroidFrameworkUtils \
-#    UnpackedTarball/skia/src/android/SkAnimatedImage \
-#    UnpackedTarball/skia/src/android/SkBitmapRegionCodec \
-#    UnpackedTarball/skia/src/android/SkBitmapRegionDecoder \
-
-#    UnpackedTarball/skia/src/codec/SkHeifCodec \
-#    UnpackedTarball/skia/src/codec/SkRawCodec \
-#    UnpackedTarball/skia/src/codec/SkWebpCodec \
-#    UnpackedTarball/skia/src/codec/SkWuffsCodec \
-#    UnpackedTarball/skia/src/utils/SkAnimCodecPlayer \
-
-#    UnpackedTarball/skia/src/gpu/gl/android/GrGLMakeNativeInterface_android \
-#    UnpackedTarball/skia/src/gpu/gl/egl/GrGLMakeNativeInterface_egl \
-#    UnpackedTarball/skia/src/gpu/gl/glfw/GrGLMakeNativeInterface_glfw \
-#    UnpackedTarball/skia/src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS \
-#    UnpackedTarball/skia/src/gpu/gl/mac/GrGLMakeNativeInterface_mac \
-
-#    UnpackedTarball/skia/src/opts/SkOpts_crc32 \
-
-#    UnpackedTarball/skia/src/ports/SkDebug_android \
-#    UnpackedTarball/skia/src/ports/SkDiscardableMemory_none \
-#    UnpackedTarball/skia/src/ports/SkFontConfigInterface \
-#    UnpackedTarball/skia/src/ports/SkFontConfigInterface_direct \
-#    UnpackedTarball/skia/src/ports/SkFontConfigInterface_direct_factory \
-#    UnpackedTarball/skia/src/ports/SkFontHost_mac \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_android \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_android_factory \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_android_parser \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_custom \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_custom_directory \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_custom_directory_factory \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_custom_embedded \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_custom_embedded_factory \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_custom_empty \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_custom_empty_factory \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_empty_factory \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_FontConfigInterface \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_FontConfigInterface_factory \
-#    UnpackedTarball/skia/src/ports/SkFontMgr_fuchsia \
-#    UnpackedTarball/skia/src/ports/SkImageEncoder_CG \
-#    UnpackedTarball/skia/src/ports/SkImageEncoder_WIC \
-#    UnpackedTarball/skia/src/ports/SkImageGeneratorCG \
-#    UnpackedTarball/skia/src/ports/SkImageGeneratorWIC \
-#    UnpackedTarball/skia/src/ports/SkImageGenerator_skia \
-#    UnpackedTarball/skia/src/ports/SkMemory_malloc \
-#    UnpackedTarball/skia/src/ports/SkMemory_mozalloc \
-#    UnpackedTarball/skia/src/ports/SkRemotableFontMgr_win_dw \
-#    UnpackedTarball/skia/src/ports/SkTLS_none \
-
-#    UnpackedTarball/skia/src/utils/mac/SkCreateCGImageRef \
-#    UnpackedTarball/skia/src/utils/mac/SkStream_mac \
-#    UnpackedTarball/skia/src/utils/win/SkAutoCoInitialize \
-#    UnpackedTarball/skia/src/utils/win/SkDWrite \
-#    UnpackedTarball/skia/src/utils/win/SkDWriteFontFileStream \
-#    UnpackedTarball/skia/src/utils/win/SkDWriteGeometrySink \
-#    UnpackedTarball/skia/src/utils/win/SkHRESULT \
-#    UnpackedTarball/skia/src/utils/win/SkIStream \
-#    UnpackedTarball/skia/src/utils/win/SkWGL_win \
-
-#    UnpackedTarball/skia/src/core/SkPicture_none \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer_none \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLMakeNativeInterface_none \
-#    UnpackedTarball/skia/src/gpu/GrPathRendering_none \
-#    UnpackedTarball/skia/src/pdf/SkDocument_PDF_None \
-
-#    UnpackedTarball/skia/src/svg/SkSVGCanvas \
-#    UnpackedTarball/skia/src/svg/SkSVGDevice \
-#    UnpackedTarball/skia/src/xml/SkDOM \
-#    UnpackedTarball/skia/src/xml/SkXMLParser \
-#    UnpackedTarball/skia/src/xml/SkXMLWriter \
-
-#    UnpackedTarball/skia/src/utils/SkLuaCanvas \
-#    UnpackedTarball/skia/src/utils/SkLua \
-
-#    UnpackedTarball/skia/src/gpu/dawn/GrDawnCaps \
-#    UnpackedTarball/skia/src/gpu/dawn/GrDawnGpuCommandBuffer \
-#    UnpackedTarball/skia/src/gpu/dawn/GrDawnGpu \
-#    UnpackedTarball/skia/src/gpu/dawn/GrDawnRenderTarget \
-#    UnpackedTarball/skia/src/gpu/dawn/GrDawnUtil \
-#    UnpackedTarball/skia/src/sksl/SkSLMain \
-#    UnpackedTarball/skia/src/sksl/lex/Main \
-#    UnpackedTarball/skia/src/sksl/lex/NFA \
-#    UnpackedTarball/skia/src/sksl/lex/RegexNode \
-#    UnpackedTarball/skia/src/sksl/lex/RegexParser \
-
-#    UnpackedTarball/skia/src/atlastext/SkAtlasTextContext \
-#    UnpackedTarball/skia/src/atlastext/SkAtlasTextTarget \
-#    UnpackedTarball/skia/src/atlastext/SkInternalAtlasTextContext \
-
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/third_party/skcms/skcms \
     UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator \
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk
index 42276177ab33..58818a840e3d 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -27,6 +27,7 @@ skia_patches := \
     fix-gcc-x86.patch.1	\
     msvc-vectorcall-sse.patch.1 \
     clang11-flax-vector-conversion.patch.0 \
+    clang-attributes-warning.patch.1 \
     fontconfig-get-typeface.patch.0 \
     windows-hfont-typeface.patch.0 \
 
diff --git a/external/skia/clang-attributes-warning.patch.1 b/external/skia/clang-attributes-warning.patch.1
new file mode 100644
index 000000000000..1e30e290b85d
--- /dev/null
+++ b/external/skia/clang-attributes-warning.patch.1
@@ -0,0 +1,31 @@
+diff --git a/include/private/SkFloatingPoint.h b/include/private/SkFloatingPoint.h
+index 110dda2ae4..530634b815 100644
+--- a/include/private/SkFloatingPoint.h
++++ b/include/private/SkFloatingPoint.h
+@@ -159,7 +159,9 @@ static inline int64_t sk_float_saturate2int64(float x) {
+ // Cast double to float, ignoring any warning about too-large finite values being cast to float.
+ // Clang thinks this is undefined, but it's actually implementation defined to return either
+ // the largest float or infinity (one of the two bracketing representable floats).  Good enough!
++#if defined(__clang__)
+ [[clang::no_sanitize("float-cast-overflow")]]
++#endif
+ static inline float sk_double_to_float(double x) {
+     return static_cast<float>(x);
+ }
+@@ -226,12 +228,16 @@ static inline float sk_float_rsqrt(float x) {
+ // IEEE defines how float divide behaves for non-finite values and zero-denoms, but C does not
+ // so we have a helper that suppresses the possible undefined-behavior warnings.
+ 
++#if defined(__clang__)
+ [[clang::no_sanitize("float-divide-by-zero")]]
++#endif
+ static inline float sk_ieee_float_divide(float numer, float denom) {
+     return numer / denom;
+ }
+ 
++#if defined(__clang__)
+ [[clang::no_sanitize("float-divide-by-zero")]]
++#endif
+ static inline double sk_ieee_double_divide(double numer, double denom) {
+     return numer / denom;
+ }
diff --git a/external/skia/fix-alpha-difference-copy.patch.1 b/external/skia/fix-alpha-difference-copy.patch.1
index a691f8f57334..5a08d092e5d3 100644
--- a/external/skia/fix-alpha-difference-copy.patch.1
+++ b/external/skia/fix-alpha-difference-copy.patch.1
@@ -3,7 +3,7 @@ index 6ae7893681..3878eb3b81 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(allocator != nullptr);
+     SkASSERT(alloc != nullptr);
  
      // TODO: in principle SkRasterPipelineSpriteBlitter could be made to handle this.
 -    if (source.alphaType() == kUnpremul_SkAlphaType) {
diff --git a/external/skia/fix-pch.patch.1 b/external/skia/fix-pch.patch.1
index 1322f6dc24f8..2cb4752a48d8 100644
--- a/external/skia/fix-pch.patch.1
+++ b/external/skia/fix-pch.patch.1
@@ -44,20 +44,6 @@ index 191b6a3ce5..26754acccd 100644
  
  #ifdef VK_USE_PLATFORM_WIN32_KHR
  // windows wants to define this as CreateSemaphoreA or CreateSemaphoreW
-diff --git a/src/utils/Sk3D.cpp b/src/utils/Sk3D.cpp
-index 0df42b5fa9..97b85233b3 100644
---- a/src/utils/Sk3D.cpp
-+++ b/src/utils/Sk3D.cpp
-@@ -38,6 +38,9 @@ void Sk3LookAt(SkMatrix44* dst, const SkPoint3& eye, const SkPoint3& center, con
-     dst->invert(dst);
- }
- 
-+#undef far
-+#undef near
-+
- bool Sk3Perspective(SkMatrix44* dst, float near, float far, float angle) {
-     SkASSERT(far > near);
- 
 diff --git a/src/utils/win/SkDWriteGeometrySink.h b/src/utils/win/SkDWriteGeometrySink.h
 index 019539b191..5dd7bef353 100644
 --- a/src/utils/win/SkDWriteGeometrySink.h
diff --git a/external/skia/inc/pch/precompiled_skia.hxx b/external/skia/inc/pch/precompiled_skia.hxx
index c39f4fb6ae2a..d91a523f8a1d 100644
--- a/external/skia/inc/pch/precompiled_skia.hxx
+++ b/external/skia/inc/pch/precompiled_skia.hxx
@@ -13,11 +13,11 @@
  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-01-31 10:35:49 using:
+ Generated on 2020-03-17 20:41:27 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:
- ./bin/update_pch_bisect /home/seli/build/src/l2/external/skia/inc/pch/precompiled_skia.hxx "make external/skia.build" --find-conflicts
+ ./bin/update_pch_bisect ./external/skia/inc/pch/precompiled_skia.hxx "make external/skia.build" --find-conflicts
 */
 
 #if PCH_LEVEL >= 1
@@ -39,7 +39,6 @@
 #include <errno.h>
 #include <float.h>
 #include <functional>
-#include <initializer_list>
 #include <inttypes.h>
 #include <iterator>
 #include <limits.h>
@@ -97,8 +96,8 @@
 #include <include/core/SkCubicMap.h>
 #include <include/core/SkData.h>
 #include <include/core/SkDataTable.h>
+#include <include/core/SkDeferredDisplayList.h>
 #include <include/core/SkDeferredDisplayListRecorder.h>
-#include <include/core/SkDeque.h>
 #include <include/core/SkDocument.h>
 #include <include/core/SkDrawLooper.h>
 #include <include/core/SkDrawable.h>
@@ -109,7 +108,6 @@
 #include <include/core/SkFontLCDConfig.h>
 #include <include/core/SkFontMetrics.h>
 #include <include/core/SkFontMgr.h>
-#include <include/core/SkFontTypes.h>
 #include <include/core/SkGraphics.h>
 #include <include/core/SkICC.h>
 #include <include/core/SkImage.h>
@@ -117,6 +115,7 @@
 #include <include/core/SkImageFilter.h>
 #include <include/core/SkImageGenerator.h>
 #include <include/core/SkImageInfo.h>
+#include <include/core/SkM44.h>
 #include <include/core/SkMallocPixelRef.h>
 #include <include/core/SkMaskFilter.h>
 #include <include/core/SkMath.h>
@@ -150,7 +149,6 @@
 #include <include/core/SkStrokeRec.h>
 #include <include/core/SkSurface.h>
 #include <include/core/SkSurfaceCharacterization.h>
-#include <include/core/SkSurfaceProps.h>
 #include <include/core/SkSwizzle.h>
 #include <include/core/SkTextBlob.h>
 #include <include/core/SkTileMode.h>
@@ -162,7 +160,6 @@
 #include <include/core/SkVertices.h>
 #include <include/core/SkYUVAIndex.h>
 #include <include/core/SkYUVASizeInfo.h>
-#include <include/docs/SkPDFDocument.h>
 #include <include/effects/Sk1DPathEffect.h>
 #include <include/effects/Sk2DPathEffect.h>
 #include <include/effects/SkAlphaThresholdFilter.h>
@@ -213,9 +210,6 @@
 #include <include/gpu/GrContextOptions.h>
 #include <include/gpu/GrContextThreadSafeProxy.h>
 #include <include/gpu/GrDriverBugWorkarounds.h>
-#include <include/gpu/GrGpuResource.h>
-#include <include/gpu/GrSurface.h>
-#include <include/gpu/GrTexture.h>
 #include <include/gpu/GrTypes.h>
 #include <include/gpu/gl/GrGLAssembleHelpers.h>
 #include <include/gpu/gl/GrGLAssembleInterface.h>
@@ -236,17 +230,16 @@
 #include <include/private/GrSingleOwner.h>
 #include <include/private/GrTypesPriv.h>
 #include <include/private/GrVkTypesPriv.h>
-#include <include/private/SkBitmaskEnum.h>
 #include <include/private/SkChecksum.h>
 #include <include/private/SkColorData.h>
-#include <include/private/SkDeferredDisplayList.h>
+#include <include/private/SkDeque.h>
 #include <include/private/SkEncodedInfo.h>
 #include <include/private/SkFixed.h>
 #include <include/private/SkFloatBits.h>
 #include <include/private/SkFloatingPoint.h>
 #include <include/private/SkHalf.h>
+#include <include/private/SkIDChangeListener.h>
 #include <include/private/SkImageInfoPriv.h>
-#include <include/private/SkM44.h>
 #include <include/private/SkMacros.h>
 #include <include/private/SkMalloc.h>
 #include <include/private/SkMutex.h>
@@ -267,7 +260,6 @@
 #include <include/private/SkTo.h>
 #include <include/private/SkVx.h>
 #include <include/third_party/skcms/skcms.h>
-#include <include/utils/Sk3D.h>
 #include <include/utils/SkBase64.h>
 #include <include/utils/SkCamera.h>
 #include <include/utils/SkCanvasStateUtils.h>
@@ -295,11 +287,8 @@
 #include <src/codec/SkFrameHolder.h>
 #include <src/codec/SkIcoCodec.h>
 #include <src/codec/SkJpegCodec.h>
-#include <src/codec/SkJpegDecoderMgr.h>
-#include <src/codec/SkJpegUtility.h>
 #include <src/codec/SkMaskSwizzler.h>
 #include <src/codec/SkMasks.h>
-#include <src/codec/SkParseEncodedOrigin.h>
 #include <src/codec/SkPngCodec.h>
 #include <src/codec/SkPngPriv.h>
 #include <src/codec/SkRawCodec.h>
@@ -319,7 +308,6 @@
 #include <src/core/SkAutoBlitterChoose.h>
 #include <src/core/SkAutoMalloc.h>
 #include <src/core/SkAutoPixmapStorage.h>
-#include <src/core/SkBBoxHierarchy.h>
 #include <src/core/SkBigPicture.h>
 #include <src/core/SkBitmapCache.h>
 #include <src/core/SkBitmapController.h>
@@ -440,6 +428,7 @@
 #include <src/core/SkSafeMath.h>
 #include <src/core/SkSafeRange.h>
 #include <src/core/SkScaleToSides.h>
+#include <src/core/SkScalerCache.h>
 #include <src/core/SkScalerContext.h>
 #include <src/core/SkScan.h>
 #include <src/core/SkScanPriv.h>
@@ -450,7 +439,6 @@
 #include <src/core/SkSpecialSurface.h>
 #include <src/core/SkSpriteBlitter.h>
 #include <src/core/SkStreamPriv.h>
-#include <src/core/SkStrike.h>
 #include <src/core/SkStrikeCache.h>
 #include <src/core/SkStrikeForGPU.h>
 #include <src/core/SkStrikeSpec.h>
@@ -462,7 +450,6 @@
 #include <src/core/SkTDynamicHash.h>
 #include <src/core/SkTInternalLList.h>
 #include <src/core/SkTLList.h>
-#include <src/core/SkTLS.h>
 #include <src/core/SkTLazy.h>
 #include <src/core/SkTSearch.h>
 #include <src/core/SkTSort.h>
@@ -480,6 +467,7 @@
 #include <src/core/SkVMBlitter.h>
 #include <src/core/SkValidationUtils.h>
 #include <src/core/SkVertState.h>
+#include <src/core/SkVerticesPriv.h>
 #include <src/core/SkWriteBuffer.h>
 #include <src/core/SkWritePixelsRec.h>
 #include <src/core/SkWriter32.h>
@@ -526,6 +514,7 @@
 #include <src/gpu/GrDrawOpAtlas.h>
 #include <src/gpu/GrDrawOpTest.h>
 #include <src/gpu/GrDrawingManager.h>
+#include <src/gpu/GrDynamicAtlas.h>
 #include <src/gpu/GrEagerVertexAllocator.h>
 #include <src/gpu/GrFPArgs.h>
 #include <src/gpu/GrFixedClip.h>
@@ -534,11 +523,13 @@
 #include <src/gpu/GrGlyph.h>
 #include <src/gpu/GrGpu.h>
 #include <src/gpu/GrGpuBuffer.h>
+#include <src/gpu/GrGpuResource.h>
 #include <src/gpu/GrGpuResourceCacheAccess.h>
 #include <src/gpu/GrGpuResourcePriv.h>
 #include <src/gpu/GrImageContextPriv.h>
 #include <src/gpu/GrImageInfo.h>
 #include <src/gpu/GrImageTextureMaker.h>
+#include <src/gpu/GrManagedResource.h>
 #include <src/gpu/GrMemoryPool.h>
 #include <src/gpu/GrMesh.h>
 #include <src/gpu/GrNativeRect.h>
@@ -588,6 +579,7 @@
 #include <src/gpu/GrStencilClip.h>
 #include <src/gpu/GrStencilSettings.h>
 #include <src/gpu/GrStyle.h>
+#include <src/gpu/GrSurface.h>
 #include <src/gpu/GrSurfaceContext.h>
 #include <src/gpu/GrSurfaceContextPriv.h>
 #include <src/gpu/GrSurfacePriv.h>
@@ -597,6 +589,7 @@
 #include <src/gpu/GrSwizzle.h>
 #include <src/gpu/GrTessellator.h>
 #include <src/gpu/GrTestUtils.h>
+#include <src/gpu/GrTexture.h>
 #include <src/gpu/GrTextureAdjuster.h>
 #include <src/gpu/GrTextureMaker.h>
 #include <src/gpu/GrTexturePriv.h>
@@ -670,6 +663,7 @@
 #include <src/gpu/effects/generated/GrComposeLerpRedEffect.h>
 #include <src/gpu/effects/generated/GrConfigConversionEffect.h>
 #include <src/gpu/effects/generated/GrConstColorProcessor.h>
+#include <src/gpu/effects/generated/GrDeviceSpaceEffect.h>
 #include <src/gpu/effects/generated/GrEllipseEffect.h>
 #include <src/gpu/effects/generated/GrHSLToRGBFilterEffect.h>
 #include <src/gpu/effects/generated/GrLumaColorFilterEffect.h>
@@ -766,12 +760,14 @@
 #include <src/gpu/ops/GrRegionOp.h>
 #include <src/gpu/ops/GrShadowRRectOp.h>
 #include <src/gpu/ops/GrSimpleMeshDrawOpHelper.h>
+#include <src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h>
 #include <src/gpu/ops/GrSmallPathRenderer.h>
 #include <src/gpu/ops/GrStencilAndCoverPathRenderer.h>
 #include <src/gpu/ops/GrStencilPathOp.h>
 #include <src/gpu/ops/GrStrokeRectOp.h>
 #include <src/gpu/ops/GrTessellatingPathRenderer.h>
 #include <src/gpu/ops/GrTextureOp.h>
+#include <src/gpu/tessellate/GrDrawAtlasPathOp.h>
 #include <src/gpu/tessellate/GrFillPathShader.h>
 #include <src/gpu/tessellate/GrGpuTessellationPathRenderer.h>
 #include <src/gpu/tessellate/GrPathParser.h>
@@ -830,7 +826,6 @@
 #include <src/image/SkSurface_Base.h>
 #include <src/image/SkSurface_Gpu.h>
 #include <src/images/SkImageEncoderPriv.h>
-#include <src/images/SkJPEGWriteUtility.h>
 #include <src/lazy/SkDiscardableMemoryPool.h>
 #include <src/pathops/SkAddIntersections.h>
 #include <src/pathops/SkIntersectionHelper.h>
@@ -856,31 +851,6 @@
 #include <src/pathops/SkPathOpsTypes.h>
 #include <src/pathops/SkPathWriter.h>
 #include <src/pathops/SkReduceOrder.h>
-#include <src/pdf/SkBitmapKey.h>
-#include <src/pdf/SkClusterator.h>
-#include <src/pdf/SkDeflate.h>
-#include <src/pdf/SkJpegInfo.h>
-#include <src/pdf/SkKeyedImage.h>
-#include <src/pdf/SkPDFBitmap.h>
-#include <src/pdf/SkPDFDevice.h>
-#include <src/pdf/SkPDFDocumentPriv.h>
-#include <src/pdf/SkPDFFont.h>
-#include <src/pdf/SkPDFFormXObject.h>
-#include <src/pdf/SkPDFGlyphUse.h>
-#include <src/pdf/SkPDFGradientShader.h>
-#include <src/pdf/SkPDFGraphicStackState.h>
-#include <src/pdf/SkPDFGraphicState.h>
-#include <src/pdf/SkPDFMakeCIDGlyphWidthsArray.h>
-#include <src/pdf/SkPDFMakeToUnicodeCmap.h>
-#include <src/pdf/SkPDFMetadata.h>
-#include <src/pdf/SkPDFResourceDict.h>
-#include <src/pdf/SkPDFShader.h>
-#include <src/pdf/SkPDFSubsetFont.h>
-#include <src/pdf/SkPDFTag.h>
-#include <src/pdf/SkPDFType1Font.h>
-#include <src/pdf/SkPDFTypes.h>
-#include <src/pdf/SkPDFUnion.h>
-#include <src/pdf/SkPDFUtils.h>
 #include <src/ports/SkOSLibrary.h>
 #include <src/sfnt/SkOTTableTypes.h>
 #include <src/sfnt/SkOTTable_OS_2.h>
@@ -897,7 +867,6 @@
 #include <src/shaders/SkLights.h>
 #include <src/shaders/SkLocalMatrixShader.h>
 #include <src/shaders/SkPictureShader.h>
-#include <src/shaders/SkRTShader.h>
 #include <src/shaders/SkShaderBase.h>
 #include <src/shaders/gradients/Sk4fGradientBase.h>
 #include <src/shaders/gradients/Sk4fLinearGradient.h>
@@ -925,6 +894,7 @@
 #include <src/sksl/SkSLParser.h>
 #include <src/sksl/SkSLPipelineStageCodeGenerator.h>
 #include <src/sksl/SkSLSPIRVCodeGenerator.h>
+#include <src/sksl/SkSLSPIRVtoHLSL.h>
 #include <src/sksl/SkSLSectionAndParameterHelper.h>
 #include <src/sksl/SkSLString.h>
 #include <src/sksl/SkSLStringStream.h>
@@ -979,7 +949,6 @@
 #include <src/sksl/ir/SkSLWhileStatement.h>
 #include <src/utils/SkCanvasStack.h>
 #include <src/utils/SkCharToGlyphCache.h>
-#include <src/utils/SkClipStackUtils.h>
 #include <src/utils/SkDashPathPriv.h>
 #include <src/utils/SkFloatToDecimal.h>
 #include <src/utils/SkJSON.h>
diff --git a/external/skia/no-trace-resources-on-exit.patch.1 b/external/skia/no-trace-resources-on-exit.patch.1
index 7a8567938eba..5b8607d55683 100644
--- a/external/skia/no-trace-resources-on-exit.patch.1
+++ b/external/skia/no-trace-resources-on-exit.patch.1
@@ -7,20 +7,20 @@ index fd44d62e94..f9e90f185f 100644
      bool isOpen() const { return fOpen; }
  
 -#ifdef SK_DEBUG
-+#ifdef SK_TRACE_VK_RESOURCES
++#ifdef SK_TRACE_MANAGED_RESOURCES
      void dumpInfo() const override {
          SkDebugf("GrVkCommandPool: %p (%d refs)\n", fCommandPool, this->getRefCnt());
      }
 diff --git a/src/gpu/vk/GrVkResource.h b/src/gpu/vk/GrVkResource.h
 index 7b9949ba1b..4e8fb48c7c 100644
---- a/src/gpu/vk/GrVkResource.h
-+++ b/src/gpu/vk/GrVkResource.h
+--- a/src/gpu/GrManagedResource.h
++++ b/src/gpu/GrManagedResource.h
 @@ -17,7 +17,7 @@ class GrVkGpu;
  
  // uncomment to enable tracing of resource refs
  #ifdef SK_DEBUG
--#define SK_TRACE_VK_RESOURCES
-+//#define SK_TRACE_VK_RESOURCES
+-#define SK_TRACE_MANAGED_RESOURCES
++//#define SK_TRACE_MANAGED_RESOURCES
  #endif
  
- /** \class GrVkResource
+ /** \class GrManagedResource
-- 
cgit v1.2.3