From 66cf4b28dc93f7348fa9b089dedbf942d6b2c2b2 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Wed, 31 May 2023 16:49:01 -0400 Subject: [PATCH] Roll Skia from cb883f64681b to d9f959926dad (11 revisions) (flutter/engine#42458) https://skia.googlesource.com/skia.git/+log/cb883f64681b..d9f959926dad 2023-05-31 skia-autoroll@skia-public.iam.gserviceaccount.com Manual roll Dawn from e56dae56bf13 to 3ee81bbacfb2 (4 revisions) 2023-05-31 lovisolo@google.com [bazel] Fold skia_test macro into skia_android_unit_test. 2023-05-31 johnstiles@google.com Split PrefixExpressions test into ES2/ES3 parts. 2023-05-31 johnstiles@google.com Add support for ++/-- postfix expressions in WGSL. 2023-05-31 lovisolo@google.com [bazel] skia_android_unit_test rule: Support select() in extra_args attribute. 2023-05-31 johnstiles@google.com Enable PrefixExpressions test in dm. 2023-05-31 johnstiles@google.com Add support for ++/-- prefix expressions in WGSL. 2023-05-31 skia-autoroll@skia-public.iam.gserviceaccount.com Manual roll Dawn from 0df9b0312c1d to e56dae56bf13 (24 revisions) 2023-05-31 johnstiles@google.com Add WGSL support for array constructors. 2023-05-31 kjlubick@google.com Sketch in gni file lists for moved colorfilter files 2023-05-31 kjlubick@google.com Decouple SkColorFilters and Ganesh GPU code If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC brianosman@google.com,jonahwilliams@google.com,rmistry@google.com,robertphillips@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Skia: https://bugs.chromium.org/p/skia/issues/entry To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 38 ++++++++++++++++--- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index d08f3e5f4c5..73d2016be0d 100644 --- a/DEPS +++ b/DEPS @@ -18,7 +18,7 @@ vars = { 'llvm_git': 'https://llvm.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': 'cb883f64681ba939414a9c0ed00ae7e294774805', + 'skia_revision': 'd9f959926dadbd1ba01e8a0274516720ee4f1d50', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. diff --git a/engine/src/flutter/ci/licenses_golden/licenses_skia b/engine/src/flutter/ci/licenses_golden/licenses_skia index 14c3ab69a2c..cd3cff95b83 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: fdb06fdc9805d13d62224c0836211209 +Signature: ca2a9bf5fa4684117990410b881bbaeb ==================================================================================================== LIBRARY: etc1 @@ -665,6 +665,7 @@ ORIGIN: ../../../third_party/skia/src/core/SkAlphaRuns.cpp + ../../../third_part ORIGIN: ../../../third_party/skia/src/core/SkAlphaRuns.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkAnalyticEdge.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkAnalyticEdge.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkBlendModeColorFilter.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkBlitBWMaskTemplate.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkBlitter.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkBlitter.h + ../../../third_party/skia/LICENSE @@ -692,7 +693,6 @@ ORIGIN: ../../../third_party/skia/src/core/SkGraphics.cpp + ../../../third_party ORIGIN: ../../../third_party/skia/src/core/SkMask.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkMaskFilter.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkMatrix.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/core/SkModeColorFilter.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkOSFile.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkPaint.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkPath.cpp + ../../../third_party/skia/LICENSE @@ -814,6 +814,7 @@ FILE: ../../../third_party/skia/src/core/SkAlphaRuns.cpp FILE: ../../../third_party/skia/src/core/SkAlphaRuns.h FILE: ../../../third_party/skia/src/core/SkAnalyticEdge.cpp FILE: ../../../third_party/skia/src/core/SkAnalyticEdge.h +FILE: ../../../third_party/skia/src/core/SkBlendModeColorFilter.cpp FILE: ../../../third_party/skia/src/core/SkBlitBWMaskTemplate.h FILE: ../../../third_party/skia/src/core/SkBlitter.cpp FILE: ../../../third_party/skia/src/core/SkBlitter.h @@ -841,7 +842,6 @@ FILE: ../../../third_party/skia/src/core/SkGraphics.cpp FILE: ../../../third_party/skia/src/core/SkMask.h FILE: ../../../third_party/skia/src/core/SkMaskFilter.cpp FILE: ../../../third_party/skia/src/core/SkMatrix.cpp -FILE: ../../../third_party/skia/src/core/SkModeColorFilter.cpp FILE: ../../../third_party/skia/src/core/SkOSFile.h FILE: ../../../third_party/skia/src/core/SkPaint.cpp FILE: ../../../third_party/skia/src/core/SkPath.cpp @@ -1433,7 +1433,6 @@ ORIGIN: ../../../third_party/skia/src/core/SkBlitRow.h + ../../../third_party/sk ORIGIN: ../../../third_party/skia/src/core/SkBlitRow_D32.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkClipStack.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkClipStack.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/core/SkColorFilter_Matrix.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkConvertPixels.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkData.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkDevice.cpp + ../../../third_party/skia/LICENSE @@ -1445,6 +1444,7 @@ ORIGIN: ../../../third_party/skia/src/core/SkFontStream.cpp + ../../../third_par ORIGIN: ../../../third_party/skia/src/core/SkLineClipper.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkLineClipper.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkMallocPixelRef.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkMatrixColorFilter.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkPictureData.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkPictureData.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkPictureFlat.cpp + ../../../third_party/skia/LICENSE @@ -1615,7 +1615,6 @@ FILE: ../../../third_party/skia/src/core/SkBlitRow.h FILE: ../../../third_party/skia/src/core/SkBlitRow_D32.cpp FILE: ../../../third_party/skia/src/core/SkClipStack.cpp FILE: ../../../third_party/skia/src/core/SkClipStack.h -FILE: ../../../third_party/skia/src/core/SkColorFilter_Matrix.cpp FILE: ../../../third_party/skia/src/core/SkConvertPixels.h FILE: ../../../third_party/skia/src/core/SkData.cpp FILE: ../../../third_party/skia/src/core/SkDevice.cpp @@ -1627,6 +1626,7 @@ FILE: ../../../third_party/skia/src/core/SkFontStream.cpp FILE: ../../../third_party/skia/src/core/SkLineClipper.cpp FILE: ../../../third_party/skia/src/core/SkLineClipper.h FILE: ../../../third_party/skia/src/core/SkMallocPixelRef.cpp +FILE: ../../../third_party/skia/src/core/SkMatrixColorFilter.cpp FILE: ../../../third_party/skia/src/core/SkPictureData.cpp FILE: ../../../third_party/skia/src/core/SkPictureData.h FILE: ../../../third_party/skia/src/core/SkPictureFlat.cpp @@ -3225,6 +3225,7 @@ ORIGIN: ../../../third_party/skia/src/core/SkXfermodeInterpretation.h + ../../.. ORIGIN: ../../../third_party/skia/src/core/SkYUVPlanesCache.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkYUVPlanesCache.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/effects/SkTableColorFilter.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/effects/SkTableColorFilter.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/effects/imagefilters/SkImageImageFilter.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/Blend.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/Device_drawTexture.cpp + ../../../third_party/skia/LICENSE @@ -3514,6 +3515,7 @@ FILE: ../../../third_party/skia/src/core/SkXfermodeInterpretation.h FILE: ../../../third_party/skia/src/core/SkYUVPlanesCache.cpp FILE: ../../../third_party/skia/src/core/SkYUVPlanesCache.h FILE: ../../../third_party/skia/src/effects/SkTableColorFilter.cpp +FILE: ../../../third_party/skia/src/effects/SkTableColorFilter.h FILE: ../../../third_party/skia/src/effects/imagefilters/SkImageImageFilter.cpp FILE: ../../../third_party/skia/src/gpu/Blend.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/Device_drawTexture.cpp @@ -8940,22 +8942,32 @@ ORIGIN: ../../../third_party/skia/src/base/SkQuads.cpp + ../../../third_party/sk ORIGIN: ../../../third_party/skia/src/base/SkQuads.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkRectMemcpy.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkSafeMath.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkBlendModeColorFilter.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkBlitter_A8.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkBlurMaskFilterImpl.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkCanvas_Raster.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkChecksum.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkColorSpaceXformColorFilter.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkColorSpaceXformColorFilter.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkComposeColorFilter.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkComposeColorFilter.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkDrawBase.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkDrawBase.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkFilterColorProgram.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkFilterColorProgram.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkFontMetricsPriv.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkFontMetricsPriv.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkMatrixColorFilter.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkMipmapBuilder.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkPixmapDraw.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRSXform.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkReadPixelsRec.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRuntimeBlender.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkRuntimeColorFilter.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkRuntimeColorFilter.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkScan_SAAPath.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkWorkingFormatColorFilter.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkWorkingFormatColorFilter.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkWritePixelsRec.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/effects/SkShaderMaskFilterImpl.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/encode/SkEncoder.cpp + ../../../third_party/skia/LICENSE @@ -8973,6 +8985,8 @@ ORIGIN: ../../../third_party/skia/src/gpu/TiledTextureUtils.h + ../../../third_p ORIGIN: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrFragmentProcessors.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrFragmentProcessors.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrTextureGenerator.cpp + ../../../third_party/skia/LICENSE @@ -9035,6 +9049,7 @@ ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLStructDefinition.cpp + ../../. ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/utils/SkGaussianColorFilter.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/toolchain/android_trampolines/gen_trampolines/gen_trampolines.go + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/skia/fuzz/FuzzCubicRoots.cpp @@ -9077,22 +9092,32 @@ FILE: ../../../third_party/skia/src/base/SkQuads.cpp FILE: ../../../third_party/skia/src/base/SkQuads.h FILE: ../../../third_party/skia/src/base/SkRectMemcpy.h FILE: ../../../third_party/skia/src/base/SkSafeMath.cpp +FILE: ../../../third_party/skia/src/core/SkBlendModeColorFilter.h FILE: ../../../third_party/skia/src/core/SkBlitter_A8.h FILE: ../../../third_party/skia/src/core/SkBlurMaskFilterImpl.h FILE: ../../../third_party/skia/src/core/SkCanvas_Raster.cpp FILE: ../../../third_party/skia/src/core/SkChecksum.cpp +FILE: ../../../third_party/skia/src/core/SkColorSpaceXformColorFilter.cpp +FILE: ../../../third_party/skia/src/core/SkColorSpaceXformColorFilter.h +FILE: ../../../third_party/skia/src/core/SkComposeColorFilter.cpp +FILE: ../../../third_party/skia/src/core/SkComposeColorFilter.h FILE: ../../../third_party/skia/src/core/SkDrawBase.cpp FILE: ../../../third_party/skia/src/core/SkDrawBase.h FILE: ../../../third_party/skia/src/core/SkFilterColorProgram.cpp FILE: ../../../third_party/skia/src/core/SkFilterColorProgram.h FILE: ../../../third_party/skia/src/core/SkFontMetricsPriv.cpp FILE: ../../../third_party/skia/src/core/SkFontMetricsPriv.h +FILE: ../../../third_party/skia/src/core/SkMatrixColorFilter.h FILE: ../../../third_party/skia/src/core/SkMipmapBuilder.cpp FILE: ../../../third_party/skia/src/core/SkPixmapDraw.cpp FILE: ../../../third_party/skia/src/core/SkRSXform.cpp FILE: ../../../third_party/skia/src/core/SkReadPixelsRec.cpp FILE: ../../../third_party/skia/src/core/SkRuntimeBlender.h +FILE: ../../../third_party/skia/src/core/SkRuntimeColorFilter.cpp +FILE: ../../../third_party/skia/src/core/SkRuntimeColorFilter.h FILE: ../../../third_party/skia/src/core/SkScan_SAAPath.cpp +FILE: ../../../third_party/skia/src/core/SkWorkingFormatColorFilter.cpp +FILE: ../../../third_party/skia/src/core/SkWorkingFormatColorFilter.h FILE: ../../../third_party/skia/src/core/SkWritePixelsRec.cpp FILE: ../../../third_party/skia/src/effects/SkShaderMaskFilterImpl.h FILE: ../../../third_party/skia/src/encode/SkEncoder.cpp @@ -9110,6 +9135,8 @@ FILE: ../../../third_party/skia/src/gpu/TiledTextureUtils.h FILE: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrFragmentProcessors.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/GrFragmentProcessors.h +FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.cpp +FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.h FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.h FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrTextureGenerator.cpp @@ -9172,6 +9199,7 @@ FILE: ../../../third_party/skia/src/sksl/ir/SkSLStructDefinition.cpp FILE: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.cpp FILE: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.h FILE: ../../../third_party/skia/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp +FILE: ../../../third_party/skia/src/utils/SkGaussianColorFilter.h FILE: ../../../third_party/skia/toolchain/android_trampolines/gen_trampolines/gen_trampolines.go ---------------------------------------------------------------------------------------------------- Copyright 2023 Google LLC