From fee983cc71116cc893d7b2ebb8215718559293d0 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Mon, 8 May 2023 23:34:21 +0000 Subject: [PATCH] Roll Skia from 7736fbaf84f0 to 485cd3d0f9ca (6 revisions) https://skia.googlesource.com/skia.git/+log/7736fbaf84f0..485cd3d0f9ca 2023-05-08 johnstiles@google.com Add SkNoDestructor class to Skia. 2023-05-08 johnstiles@google.com Generate simpler code for sk_Clockwise in SPIR-V. 2023-05-08 johnstiles@google.com Eliminate DSLBlock class. 2023-05-08 kjlubick@google.com [base] Move SkSpinlock and SkSharedMutex to src/base 2023-05-08 johnstiles@google.com Eliminate most DSL statement support. 2023-05-08 johnstiles@google.com Simplify Perlin noise chained-if block. 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,djsollen@google.com,jimgraham@google.com,rmistry@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 +- ci/licenses_golden/licenses_skia | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/DEPS b/DEPS index 78a9487bdf829..d017385755871 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': '7736fbaf84f06057637538449a2a62f442fff378', + 'skia_revision': '485cd3d0f9ca5524458c168b8d31c64c6348655e', # 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/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index c8b2cf482049d..aabae27ca58ca 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 126831cc78d416d4d830c20a186ac345 +Signature: ce9c98917b4b6bfb0320bf0ddbe2ea8d ==================================================================================================== LIBRARY: etc1 @@ -3148,13 +3148,16 @@ ORIGIN: ../../../third_party/skia/include/ports/SkFontMgr_android.h + ../../../t ORIGIN: ../../../third_party/skia/include/ports/SkFontMgr_directory.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/ports/SkFontMgr_empty.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/ports/SkFontMgr_fontconfig.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/include/private/SkSpinlock.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/base/SkMutex.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/base/SkSemaphore.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/base/SkThreadID.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/svg/SkSVGCanvas.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/utils/SkPaintFilterCanvas.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkSemaphore.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/base/SkSharedMutex.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/base/SkSharedMutex.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/base/SkSpinlock.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/base/SkSpinlock.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkTDPQueue.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkThreadID.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkAndroidCodec.cpp + ../../../third_party/skia/LICENSE @@ -3216,9 +3219,6 @@ ORIGIN: ../../../third_party/skia/src/core/SkPoint3.cpp + ../../../third_party/s ORIGIN: ../../../third_party/skia/src/core/SkRecord.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRecordPattern.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRecords.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/core/SkSharedMutex.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/core/SkSharedMutex.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/core/SkSpinlock.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkTHash.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkTime.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkXfermodeInterpretation.cpp + ../../../third_party/skia/LICENSE @@ -3437,13 +3437,16 @@ FILE: ../../../third_party/skia/include/ports/SkFontMgr_android.h FILE: ../../../third_party/skia/include/ports/SkFontMgr_directory.h FILE: ../../../third_party/skia/include/ports/SkFontMgr_empty.h FILE: ../../../third_party/skia/include/ports/SkFontMgr_fontconfig.h -FILE: ../../../third_party/skia/include/private/SkSpinlock.h FILE: ../../../third_party/skia/include/private/base/SkMutex.h FILE: ../../../third_party/skia/include/private/base/SkSemaphore.h FILE: ../../../third_party/skia/include/private/base/SkThreadID.h FILE: ../../../third_party/skia/include/svg/SkSVGCanvas.h FILE: ../../../third_party/skia/include/utils/SkPaintFilterCanvas.h FILE: ../../../third_party/skia/src/base/SkSemaphore.cpp +FILE: ../../../third_party/skia/src/base/SkSharedMutex.cpp +FILE: ../../../third_party/skia/src/base/SkSharedMutex.h +FILE: ../../../third_party/skia/src/base/SkSpinlock.cpp +FILE: ../../../third_party/skia/src/base/SkSpinlock.h FILE: ../../../third_party/skia/src/base/SkTDPQueue.h FILE: ../../../third_party/skia/src/base/SkThreadID.cpp FILE: ../../../third_party/skia/src/codec/SkAndroidCodec.cpp @@ -3505,9 +3508,6 @@ FILE: ../../../third_party/skia/src/core/SkPoint3.cpp FILE: ../../../third_party/skia/src/core/SkRecord.cpp FILE: ../../../third_party/skia/src/core/SkRecordPattern.h FILE: ../../../third_party/skia/src/core/SkRecords.cpp -FILE: ../../../third_party/skia/src/core/SkSharedMutex.cpp -FILE: ../../../third_party/skia/src/core/SkSharedMutex.h -FILE: ../../../third_party/skia/src/core/SkSpinlock.cpp FILE: ../../../third_party/skia/src/core/SkTHash.h FILE: ../../../third_party/skia/src/core/SkTime.cpp FILE: ../../../third_party/skia/src/core/SkXfermodeInterpretation.cpp @@ -5534,6 +5534,7 @@ ORIGIN: ../../../third_party/skia/fuzz/FuzzEncoders.cpp + ../../../third_party/s ORIGIN: ../../../third_party/skia/fuzz/FuzzPolyUtils.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/modules/canvaskit/canvaskit_bindings.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/modules/pathkit/pathkit_wasm_bindings.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/base/SkNoDestructor.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkGlyph.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkTypeface_remote.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd @@ -5541,6 +5542,7 @@ FILE: ../../../third_party/skia/fuzz/FuzzEncoders.cpp FILE: ../../../third_party/skia/fuzz/FuzzPolyUtils.cpp FILE: ../../../third_party/skia/modules/canvaskit/canvaskit_bindings.cpp FILE: ../../../third_party/skia/modules/pathkit/pathkit_wasm_bindings.cpp +FILE: ../../../third_party/skia/src/base/SkNoDestructor.h FILE: ../../../third_party/skia/src/core/SkGlyph.cpp FILE: ../../../third_party/skia/src/core/SkTypeface_remote.cpp ---------------------------------------------------------------------------------------------------- @@ -8000,8 +8002,6 @@ ORIGIN: ../../../third_party/skia/src/sksl/SkSLParser.cpp + ../../../third_party ORIGIN: ../../../third_party/skia/src/sksl/SkSLParser.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/SkSLPosition.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/SkSLProgramKind.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLBlock.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLBlock.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLFunction.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLFunction.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLLayout.cpp + ../../../third_party/skia/LICENSE @@ -8042,8 +8042,6 @@ FILE: ../../../third_party/skia/src/sksl/SkSLParser.cpp FILE: ../../../third_party/skia/src/sksl/SkSLParser.h FILE: ../../../third_party/skia/src/sksl/SkSLPosition.h FILE: ../../../third_party/skia/src/sksl/SkSLProgramKind.h -FILE: ../../../third_party/skia/src/sksl/dsl/DSLBlock.cpp -FILE: ../../../third_party/skia/src/sksl/dsl/DSLBlock.h FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.cpp FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.h FILE: ../../../third_party/skia/src/sksl/dsl/DSLLayout.cpp