From 2dd8487be5cd2ed4d0342f514c6b438a5f77a39f Mon Sep 17 00:00:00 2001
From: Xisco Fauli <xiscofauli@libreoffice.org>
Date: Fri, 4 Jul 2025 23:03:27 +0200
Subject: [PATCH] skia: update pch

hoping it fixes lo_daily_tb_win_arm64
C:/cygwin64/home/tdf/jenkins/workspace/lo_daily_src/vcl/inc\skia/utils.hxx(34): fatal error C1083: Cannot open include file: 'SkRegion.h': No such file or directory
make[1]: *** [C:/cygwin64/home/tdf/jenkins/workspace/lo_daily_src/solenv/gbuild/LinkTarget.mk:338: C:/cygwin64/home/tdf/jenkins/workspace/build_master/workdir_for_build/CxxObject/vcl/win/app/salinst.o] Error 2
make[1]: *** Waiting for unfinished jobs....
C:/cygwin64/home/tdf/jenkins/workspace/lo_daily_src/vcl/inc\skia/utils.hxx(34): fatal error C1083: Cannot open include file: 'SkRegion.h': No such file or directory
make[1]: *** [C:/cygwin64/home/tdf/jenkins/workspace/lo_daily_src/solenv/gbuild/LinkTarget.mk:335: C:/cygwin64/home/tdf/jenkins/workspace/build_master/workdir_for_build/CxxObject/vcl/win/gdi/salgdi.o] Error 2
C:/cygwin64/home/tdf/jenkins/workspace/lo_daily_src/vcl/inc\skia/win/font.hxx(17): fatal error C1083: Cannot open include file: 'SkTypeface.h': No such file or directory
make[1]: *** [C:/cygwin64/home/tdf/jenkins/workspace/lo_daily_src/solenv/gbuild/LinkTarget.mk:335: C:/cygwin64/home/tdf/jenkins/workspace/build_master/workdir_for_build/CxxObject/vcl/win/gdi/salfont.o] Error 2
make: *** [Makefile:316: cross-toolset] Error 2
+ exit 2

Change-Id: I393057c6a39bae428dd8c995d89d046612ff079a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187432
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
---
 external/skia/inc/pch/precompiled_skia.hxx | 139 +++++++++++----------
 1 file changed, 76 insertions(+), 63 deletions(-)

diff --git a/external/skia/inc/pch/precompiled_skia.hxx b/external/skia/inc/pch/precompiled_skia.hxx
index 6a64b00d8de1..95cb8dc55c3e 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 2023-07-09 12:12:38 using:
+ Generated on 2025-07-04 22:59:10 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:
@@ -24,13 +24,12 @@
 #if PCH_LEVEL >= 1
 #include <algorithm>
 #include <array>
+#include <assert.h>
 #include <atomic>
-#include <bitset>
 #include <cassert>
 #include <cctype>
 #include <cerrno>
 #include <cfloat>
-#include <chrono>
 #include <cinttypes>
 #include <climits>
 #include <cmath>
@@ -48,6 +47,7 @@
 #include <functional>
 #include <initializer_list>
 #include <inttypes.h>
+#include <iomanip>
 #include <iterator>
 #include <limits.h>
 #include <limits>
@@ -58,12 +58,11 @@
 #include <optional>
 #include <png.h>
 #include <pngconf.h>
-#include <queue>
-#include <ratio>
 #include <set>
+#include <skcms_internals.h>
+#include <skcms_public.h>
 #include <sstream>
 #include <stdarg.h>
-#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -72,29 +71,33 @@
 #include <thread>
 #include <tuple>
 #include <type_traits>
-#include <unordered_map>
 #include <utility>
 #include <vector>
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
-#include <rtl/alloc.h>
-#include <sal/log.hxx>
 #endif // PCH_LEVEL >= 2
 #if PCH_LEVEL >= 3
 #include <include/codec/SkAndroidCodec.h>
+#include <include/codec/SkBmpDecoder.h>
 #include <include/codec/SkCodec.h>
 #include <include/codec/SkCodecAnimation.h>
 #include <include/codec/SkEncodedImageFormat.h>
 #include <include/codec/SkEncodedOrigin.h>
+#include <include/codec/SkIcoDecoder.h>
 #include <include/codec/SkPixmapUtils.h>
 #include <include/codec/SkPngChunkReader.h>
+#include <include/codec/SkPngDecoder.h>
+#include <include/codec/SkWbmpDecoder.h>
 #include <include/core/SkAlphaType.h>
 #include <include/core/SkAnnotation.h>
+#include <include/core/SkArc.h>
 #include <include/core/SkBBHFactory.h>
 #include <include/core/SkBitmap.h>
 #include <include/core/SkBlendMode.h>
 #include <include/core/SkBlender.h>
 #include <include/core/SkBlurTypes.h>
+#include <include/core/SkCPUContext.h>
+#include <include/core/SkCPURecorder.h>
 #include <include/core/SkCanvas.h>
 #include <include/core/SkCapabilities.h>
 #include <include/core/SkClipOp.h>
@@ -118,6 +121,7 @@
 #include <include/core/SkFontParameters.h>
 #include <include/core/SkFontStyle.h>
 #include <include/core/SkFontTypes.h>
+#include <include/core/SkFourByteTag.h>
 #include <include/core/SkGraphics.h>
 #include <include/core/SkImage.h>
 #include <include/core/SkImageFilter.h>
@@ -128,7 +132,6 @@
 #include <include/core/SkMaskFilter.h>
 #include <include/core/SkMatrix.h>
 #include <include/core/SkMesh.h>
-#include <include/core/SkOpenTypeSVGDecoder.h>
 #include <include/core/SkOverdrawCanvas.h>
 #include <include/core/SkPaint.h>
 #include <include/core/SkPath.h>
@@ -146,6 +149,7 @@
 #include <include/core/SkRRect.h>
 #include <include/core/SkRSXform.h>
 #include <include/core/SkRasterHandleAllocator.h>
+#include <include/core/SkRecorder.h>
 #include <include/core/SkRect.h>
 #include <include/core/SkRefCnt.h>
 #include <include/core/SkRegion.h>
@@ -164,7 +168,6 @@
 #include <include/core/SkTextBlob.h>
 #include <include/core/SkTileMode.h>
 #include <include/core/SkTiledImageUtils.h>
-#include <include/core/SkTime.h>
 #include <include/core/SkTraceMemoryDump.h>
 #include <include/core/SkTypeface.h>
 #include <include/core/SkTypes.h>
@@ -172,6 +175,7 @@
 #include <include/core/SkVertices.h>
 #include <include/core/SkYUVAInfo.h>
 #include <include/core/SkYUVAPixmaps.h>
+#include <include/docs/SkMultiPictureDocument.h>
 #include <include/effects/Sk1DPathEffect.h>
 #include <include/effects/Sk2DPathEffect.h>
 #include <include/effects/SkBlenders.h>
@@ -183,29 +187,22 @@
 #include <include/effects/SkHighContrastFilter.h>
 #include <include/effects/SkImageFilters.h>
 #include <include/effects/SkLumaColorFilter.h>
-#include <include/effects/SkOpPathEffect.h>
 #include <include/effects/SkOverdrawColorFilter.h>
 #include <include/effects/SkPerlinNoiseShader.h>
 #include <include/effects/SkRuntimeEffect.h>
 #include <include/effects/SkShaderMaskFilter.h>
-#include <include/effects/SkStrokeAndFillPathEffect.h>
 #include <include/effects/SkTableMaskFilter.h>
 #include <include/effects/SkTrimPathEffect.h>
 #include <include/encode/SkEncoder.h>
 #include <include/encode/SkICC.h>
 #include <include/encode/SkPngEncoder.h>
-#include <include/gpu/GrDirectContext.h>
-#include <include/pathops/SkPathOps.h>
-#include <include/ports/SkRemotableFontMgr.h>
-#include <include/private/SkBitmaskEnum.h>
-#include <include/private/SkColorData.h>
+#include <include/gpu/ganesh/GrDirectContext.h>
 #include <include/private/SkEncodedInfo.h>
+#include <include/private/SkExif.h>
 #include <include/private/SkGainmapInfo.h>
 #include <include/private/SkIDChangeListener.h>
 #include <include/private/SkPathRef.h>
-#include <include/private/SkSLDefines.h>
 #include <include/private/SkSLSampleUsage.h>
-#include <include/private/SkShadowFlags.h>
 #include <include/private/base/SkAlign.h>
 #include <include/private/base/SkAssert.h>
 #include <include/private/base/SkCPUTypes.h>
@@ -214,7 +211,6 @@
 #include <include/private/base/SkDeque.h>
 #include <include/private/base/SkFeatures.h>
 #include <include/private/base/SkFixed.h>
-#include <include/private/base/SkFloatBits.h>
 #include <include/private/base/SkFloatingPoint.h>
 #include <include/private/base/SkMacros.h>
 #include <include/private/base/SkMalloc.h>
@@ -222,7 +218,6 @@
 #include <include/private/base/SkMutex.h>
 #include <include/private/base/SkNoncopyable.h>
 #include <include/private/base/SkOnce.h>
-#include <include/private/base/SkPathEnums.h>
 #include <include/private/base/SkPoint_impl.h>
 #include <include/private/base/SkSafe32.h>
 #include <include/private/base/SkSemaphore.h>
@@ -230,6 +225,7 @@
 #include <include/private/base/SkTArray.h>
 #include <include/private/base/SkTDArray.h>
 #include <include/private/base/SkTFitsIn.h>
+#include <include/private/base/SkTLogic.h>
 #include <include/private/base/SkTPin.h>
 #include <include/private/base/SkTemplates.h>
 #include <include/private/base/SkThreadAnnotations.h>
@@ -237,8 +233,8 @@
 #include <include/private/base/SkTo.h>
 #include <include/private/chromium/SkChromeRemoteGlyphCache.h>
 #include <include/private/chromium/SkDiscardableMemory.h>
+#include <include/private/chromium/SkPMColor.h>
 #include <include/private/chromium/Slug.h>
-#include <include/utils/SkBase64.h>
 #include <include/utils/SkCamera.h>
 #include <include/utils/SkCanvasStateUtils.h>
 #include <include/utils/SkCustomTypeface.h>
@@ -253,16 +249,45 @@
 #include <include/utils/SkShadowUtils.h>
 #include <include/utils/SkTextUtils.h>
 #include <include/utils/SkTraceEventPhase.h>
+#include <modules/pathops/include/SkPathOps.h>
+#include <modules/pathops/src/SkAddIntersections.h>
+#include <modules/pathops/src/SkIntersectionHelper.h>
+#include <modules/pathops/src/SkIntersections.h>
+#include <modules/pathops/src/SkLineParameters.h>
+#include <modules/pathops/src/SkOpAngle.h>
+#include <modules/pathops/src/SkOpCoincidence.h>
+#include <modules/pathops/src/SkOpContour.h>
+#include <modules/pathops/src/SkOpEdgeBuilder.h>
+#include <modules/pathops/src/SkOpSegment.h>
+#include <modules/pathops/src/SkOpSpan.h>
+#include <modules/pathops/src/SkPathOpsBounds.h>
+#include <modules/pathops/src/SkPathOpsCommon.h>
+#include <modules/pathops/src/SkPathOpsConic.h>
+#include <modules/pathops/src/SkPathOpsCubic.h>
+#include <modules/pathops/src/SkPathOpsCurve.h>
+#include <modules/pathops/src/SkPathOpsDebug.h>
+#include <modules/pathops/src/SkPathOpsLine.h>
+#include <modules/pathops/src/SkPathOpsPoint.h>
+#include <modules/pathops/src/SkPathOpsQuad.h>
+#include <modules/pathops/src/SkPathOpsRect.h>
+#include <modules/pathops/src/SkPathOpsTCurve.h>
+#include <modules/pathops/src/SkPathOpsTSect.h>
+#include <modules/pathops/src/SkPathOpsTypes.h>
+#include <modules/pathops/src/SkPathWriter.h>
+#include <modules/pathops/src/SkReduceOrder.h>
 #include <modules/skcms/skcms.h>
 #include <src/base/SkArenaAlloc.h>
 #include <src/base/SkAutoMalloc.h>
+#include <src/base/SkBase64.h>
 #include <src/base/SkBezierCurves.h>
+#include <src/base/SkBitmaskEnum.h>
 #include <src/base/SkBlockAllocator.h>
 #include <src/base/SkBuffer.h>
 #include <src/base/SkCubics.h>
 #include <src/base/SkEndian.h>
+#include <src/base/SkEnumBitMask.h>
+#include <src/base/SkFloatBits.h>
 #include <src/base/SkHalf.h>
-#include <src/base/SkLeanWindows.h>
 #include <src/base/SkMSAN.h>
 #include <src/base/SkMathPriv.h>
 #include <src/base/SkNoDestructor.h>
@@ -295,13 +320,16 @@
 #include <src/codec/SkFrameHolder.h>
 #include <src/codec/SkIcoCodec.h>
 #include <src/codec/SkMaskSwizzler.h>
-#include <src/codec/SkMasks.h>
+#include <src/codec/SkParseEncodedOrigin.h>
 #include <src/codec/SkPixmapUtilsPriv.h>
 #include <src/codec/SkPngCodec.h>
+#include <src/codec/SkPngCodecBase.h>
+#include <src/codec/SkPngCompositeChunkReader.h>
 #include <src/codec/SkPngPriv.h>
 #include <src/codec/SkSampledCodec.h>
 #include <src/codec/SkSampler.h>
 #include <src/codec/SkSwizzler.h>
+#include <src/codec/SkTiffUtility.h>
 #include <src/codec/SkWbmpCodec.h>
 #include <src/core/SkAAClip.h>
 #include <src/core/SkATrace.h>
@@ -318,17 +346,23 @@
 #include <src/core/SkBlendModeBlender.h>
 #include <src/core/SkBlendModePriv.h>
 #include <src/core/SkBlenderBase.h>
+#include <src/core/SkBlitMask.h>
 #include <src/core/SkBlitRow.h>
 #include <src/core/SkBlitter.h>
 #include <src/core/SkBlitter_A8.h>
+#include <src/core/SkBlurEngine.h>
 #include <src/core/SkBlurMask.h>
 #include <src/core/SkBlurMaskFilterImpl.h>
+#include <src/core/SkCPUContextImpl.h>
+#include <src/core/SkCPURecorderImpl.h>
 #include <src/core/SkCachedData.h>
 #include <src/core/SkCanvasPriv.h>
 #include <src/core/SkChecksum.h>
 #include <src/core/SkClipStack.h>
 #include <src/core/SkClipStackDevice.h>
+#include <src/core/SkColorData.h>
 #include <src/core/SkColorFilterPriv.h>
+#include <src/core/SkColorPriv.h>
 #include <src/core/SkColorSpacePriv.h>
 #include <src/core/SkColorSpaceXformSteps.h>
 #include <src/core/SkCompressedDataUtils.h>
@@ -343,18 +377,17 @@
 #include <src/core/SkDrawBase.h>
 #include <src/core/SkDrawProcs.h>
 #include <src/core/SkDrawShadowInfo.h>
+#include <src/core/SkDrawTypes.h>
 #include <src/core/SkEdge.h>
 #include <src/core/SkEdgeBuilder.h>
 #include <src/core/SkEdgeClipper.h>
 #include <src/core/SkEffectPriv.h>
 #include <src/core/SkEnumerate.h>
 #include <src/core/SkFDot6.h>
-#include <src/core/SkFilterColorProgram.h>
 #include <src/core/SkFontDescriptor.h>
 #include <src/core/SkFontMetricsPriv.h>
 #include <src/core/SkFontPriv.h>
 #include <src/core/SkFontStream.h>
-#include <src/core/SkFuzzLogging.h>
 #include <src/core/SkGaussFilter.h>
 #include <src/core/SkGeometry.h>
 #include <src/core/SkGlyph.h>
@@ -364,6 +397,7 @@
 #include <src/core/SkImageFilter_Base.h>
 #include <src/core/SkImageInfoPriv.h>
 #include <src/core/SkImagePriv.h>
+#include <src/core/SkKnownRuntimeEffects.h>
 #include <src/core/SkLRUCache.h>
 #include <src/core/SkLatticeIter.h>
 #include <src/core/SkLineClipper.h>
@@ -374,10 +408,12 @@
 #include <src/core/SkMaskCache.h>
 #include <src/core/SkMaskFilterBase.h>
 #include <src/core/SkMaskGamma.h>
+#include <src/core/SkMasks.h>
 #include <src/core/SkMatrixInvert.h>
 #include <src/core/SkMatrixPriv.h>
-#include <src/core/SkMatrixProvider.h>
 #include <src/core/SkMatrixUtils.h>
+#include <src/core/SkMemset.h>
+#include <src/core/SkMeshPriv.h>
 #include <src/core/SkMessageBus.h>
 #include <src/core/SkMipmap.h>
 #include <src/core/SkMipmapAccessor.h>
@@ -385,9 +421,11 @@
 #include <src/core/SkNextID.h>
 #include <src/core/SkOSFile.h>
 #include <src/core/SkOpts.h>
+#include <src/core/SkOptsTargets.h>
 #include <src/core/SkPaintDefaults.h>
 #include <src/core/SkPaintPriv.h>
 #include <src/core/SkPathEffectBase.h>
+#include <src/core/SkPathEnums.h>
 #include <src/core/SkPathMakers.h>
 #include <src/core/SkPathMeasurePriv.h>
 #include <src/core/SkPathPriv.h>
@@ -404,16 +442,18 @@
 #include <src/core/SkRTree.h>
 #include <src/core/SkRasterClip.h>
 #include <src/core/SkRasterPipeline.h>
+#include <src/core/SkRasterPipelineContextUtils.h>
 #include <src/core/SkRasterPipelineOpContexts.h>
 #include <src/core/SkRasterPipelineOpList.h>
+#include <src/core/SkRasterPipelineVizualizer.h>
 #include <src/core/SkReadBuffer.h>
 #include <src/core/SkReadPixelsRec.h>
 #include <src/core/SkRecord.h>
+#include <src/core/SkRecordCanvas.h>
 #include <src/core/SkRecordDraw.h>
 #include <src/core/SkRecordOpts.h>
 #include <src/core/SkRecordPattern.h>
 #include <src/core/SkRecordedDrawable.h>
-#include <src/core/SkRecorder.h>
 #include <src/core/SkRecords.h>
 #include <src/core/SkRectPriv.h>
 #include <src/core/SkRegionPriv.h>
@@ -428,7 +468,6 @@
 #include <src/core/SkScan.h>
 #include <src/core/SkScanPriv.h>
 #include <src/core/SkSpecialImage.h>
-#include <src/core/SkSpecialSurface.h>
 #include <src/core/SkSpriteBlitter.h>
 #include <src/core/SkStreamPriv.h>
 #include <src/core/SkStrike.h>
@@ -439,17 +478,15 @@
 #include <src/core/SkStrokerPriv.h>
 #include <src/core/SkSurfacePriv.h>
 #include <src/core/SkSwizzlePriv.h>
+#include <src/core/SkSynchronizedResourceCache.h>
 #include <src/core/SkTDynamicHash.h>
 #include <src/core/SkTHash.h>
 #include <src/core/SkTaskGroup.h>
 #include <src/core/SkTextBlobPriv.h>
-#include <src/core/SkTextBlobTrace.h>
 #include <src/core/SkTextFormatParams.h>
 #include <src/core/SkTraceEvent.h>
 #include <src/core/SkTypefaceCache.h>
 #include <src/core/SkTypeface_remote.h>
-#include <src/core/SkVM.h>
-#include <src/core/SkVMBlitter.h>
 #include <src/core/SkValidationUtils.h>
 #include <src/core/SkVertState.h>
 #include <src/core/SkVerticesPriv.h>
@@ -462,7 +499,6 @@
 #include <src/effects/SkDashImpl.h>
 #include <src/effects/SkEmbossMask.h>
 #include <src/effects/SkEmbossMaskFilter.h>
-#include <src/effects/SkOpPE.h>
 #include <src/effects/SkShaderMaskFilterImpl.h>
 #include <src/effects/SkTrimPE.h>
 #include <src/effects/colorfilters/SkBlendModeColorFilter.h>
@@ -474,10 +510,11 @@
 #include <src/effects/colorfilters/SkRuntimeColorFilter.h>
 #include <src/effects/colorfilters/SkTableColorFilter.h>
 #include <src/effects/colorfilters/SkWorkingFormatColorFilter.h>
-#include <src/effects/imagefilters/SkCropImageFilter.h>
+#include <src/effects/imagefilters/SkMatrixConvolutionImageFilter.h>
 #include <src/encode/SkICCPriv.h>
 #include <src/encode/SkImageEncoderFns.h>
 #include <src/encode/SkImageEncoderPriv.h>
+#include <src/encode/SkPngEncoderBase.h>
 #include <src/encode/SkPngEncoderImpl.h>
 #include <src/image/SkImageGeneratorPriv.h>
 #include <src/image/SkImage_Base.h>
@@ -489,31 +526,7 @@
 #include <src/image/SkSurface_Base.h>
 #include <src/image/SkSurface_Raster.h>
 #include <src/lazy/SkDiscardableMemoryPool.h>
-#include <src/pathops/SkAddIntersections.h>
-#include <src/pathops/SkIntersectionHelper.h>
-#include <src/pathops/SkIntersections.h>
-#include <src/pathops/SkLineParameters.h>
-#include <src/pathops/SkOpAngle.h>
-#include <src/pathops/SkOpCoincidence.h>
-#include <src/pathops/SkOpContour.h>
-#include <src/pathops/SkOpEdgeBuilder.h>
-#include <src/pathops/SkOpSegment.h>
-#include <src/pathops/SkOpSpan.h>
-#include <src/pathops/SkPathOpsBounds.h>
-#include <src/pathops/SkPathOpsCommon.h>
-#include <src/pathops/SkPathOpsConic.h>
-#include <src/pathops/SkPathOpsCubic.h>
-#include <src/pathops/SkPathOpsCurve.h>
-#include <src/pathops/SkPathOpsDebug.h>
-#include <src/pathops/SkPathOpsLine.h>
-#include <src/pathops/SkPathOpsPoint.h>
-#include <src/pathops/SkPathOpsQuad.h>
-#include <src/pathops/SkPathOpsRect.h>
-#include <src/pathops/SkPathOpsTCurve.h>
-#include <src/pathops/SkPathOpsTSect.h>
-#include <src/pathops/SkPathOpsTypes.h>
-#include <src/pathops/SkPathWriter.h>
-#include <src/pathops/SkReduceOrder.h>
+#include <src/ports/SkTypeface_proxy.h>
 #include <src/sfnt/SkOTTableTypes.h>
 #include <src/sfnt/SkOTTable_OS_2.h>
 #include <src/sfnt/SkOTTable_head.h>
@@ -528,11 +541,13 @@
 #include <src/shaders/SkImageShader.h>
 #include <src/shaders/SkLocalMatrixShader.h>
 #include <src/shaders/SkPerlinNoiseShaderImpl.h>
+#include <src/shaders/SkPerlinNoiseShaderType.h>
 #include <src/shaders/SkPictureShader.h>
 #include <src/shaders/SkRuntimeShader.h>
 #include <src/shaders/SkShaderBase.h>
 #include <src/shaders/SkTransformShader.h>
 #include <src/shaders/SkTriColorShader.h>
+#include <src/shaders/SkWorkingColorSpaceShader.h>
 #include <src/shaders/gradients/SkConicalGradient.h>
 #include <src/shaders/gradients/SkGradientBaseShader.h>
 #include <src/shaders/gradients/SkLinearGradient.h>
@@ -546,17 +561,15 @@
 #include <src/utils/SkClipStackUtils.h>
 #include <src/utils/SkDashPathPriv.h>
 #include <src/utils/SkFloatToDecimal.h>
-#include <src/utils/SkJSON.h>
 #include <src/utils/SkJSONWriter.h>
 #include <src/utils/SkMatrix22.h>
-#include <src/utils/SkMultiPictureDocument.h>
 #include <src/utils/SkMultiPictureDocumentPriv.h>
 #include <src/utils/SkOSPath.h>
 #include <src/utils/SkPatchUtils.h>
 #include <src/utils/SkPolyUtils.h>
 #include <src/utils/SkShaderUtils.h>
 #include <src/utils/SkShadowTessellator.h>
-#include <tools/sk_app/WindowContext.h>
+#include <tools/window/WindowContext.h>
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4
 #include <skia_compiler.hxx>