From 90cad5e5d40203c327366a3cc25ca8fd3bd3786f Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Fri, 6 Oct 2023 19:30:23 -0400 Subject: [PATCH] Roll Skia from d86da2a029d8 to 2f67f1f18562 (36 revisions) (flutter/engine#46636) Roll Skia from d86da2a029d8 to 2f67f1f18562 (36 revisions) https://skia.googlesource.com/skia.git/+log/d86da2a029d8..2f67f1f18562 2023-10-06 kjlubick@google.com Add dedicated function to calculate length of Base64 encoded string 2023-10-06 bungeman@google.com [pathops] Simplify trivial paths to empty 2023-10-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 44a79902f2c1 to 01742293d0f2 (11 revisions) 2023-10-06 johnstiles@google.com Add fuzzer for SkSL-to-WGSL. 2023-10-06 johnstiles@google.com Add fuzzer for runtime blenders. 2023-10-06 johnstiles@google.com Add fuzzer for runtime color filters. 2023-10-06 skia-autoroll@skia-public.iam.gserviceaccount.com Manual roll Dawn from a42cebae4e42 to ac72499c0a8a (91 revisions) 2023-10-06 kjlubick@google.com Split codec-related parts out of tools/Resources.h 2023-10-06 drott@chromium.org [Fontations] Borrow glyph mask flag implementation from FreeType 2023-10-06 jvanverth@google.com Try to fix Dawn roll again. 2023-10-06 drott@chromium.org [Fontations] FFI Interface for accessing CPAL and COLRv0 info 2023-10-06 jvanverth@google.com Disable Tint's use of //build directory to fix Dawn roll 2023-10-06 johnstiles@google.com Add workaround for dropped clear in VKDMSAA. 2023-10-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from 3d75b794df0f to 8c341cfdef74 (3 revisions) 2023-10-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 46c5d45d5955 to 44a79902f2c1 (15 revisions) 2023-10-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Skia Infra from e12f70e0a324 to 8d9cef29be25 (3 revisions) 2023-10-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll SK Tool from 535363447183 to 8d9cef29be25 2023-10-06 jvanverth@google.com [graphite] Revise PathAtlas::onAddShape interface. 2023-10-05 lovisolo@google.com [bazel] BazelBenchmarkRunner.cpp: Write results.json output file in Perf's new JSON format. 2023-10-05 johnstiles@google.com Factor out FuzzCreateValidInputsForRuntimeEffect to FuzzCommon. 2023-10-05 johnstiles@google.com Disable broken GMs on Adreno 5xx/6xx + Vulkan. 2023-10-05 kjlubick@google.com Split ToolUtils into a few files for easier modularization 2023-10-05 kjlubick@google.com Enforce IWYU on ToolUtils.h 2023-10-05 bungeman@google.com Revert "[pdf] Simplify filled paths" 2023-10-05 johnstiles@google.com Outset the rect passed to SkMesh::MakeIndexed. 2023-10-05 kjlubick@google.com Use buildifier to reformat all Bazel files 2023-10-05 robertphillips@google.com [graphite] Short circuit key generation for simple paints 2023-10-05 johnstiles@google.com Add saturate to list of supported WGSL intrinsics. 2023-10-05 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 404a76d9bf0e to 46c5d45d5955 (1 revision) 2023-10-05 bungeman@google.com [pdf] Simplify filled paths 2023-10-05 kjlubick@google.com Make SkReadBuffer *not* call SkImages::DeferredFromEncodedData by default 2023-10-05 armansito@google.com [graphite][dawn][viewer] Support turning vsync off 2023-10-05 lovisolo@google.com [bazel] BazelBenchmarkRunner.cpp: Add more flags and better validation. 2023-10-05 robertphillips@google.com [graphite] Add CoeffBlenderBlock::AddBlock 2023-10-05 robertphillips@google.com [graphite] Add ColorSpaceTransformBlock::AddBlock 2023-10-05 johnstiles@google.com Enable child effects in SkMesh programs. 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,chinmaygarde@google.com,djsollen@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 ... --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 47 ++++++++++++++++++- .../flutter/sky/packages/sky_engine/LICENSE | 32 +++++++++++++ 3 files changed, 78 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index f66a380ca4..5ca415438c 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': 'd86da2a029d871842d23b143cef0a1c41b9fa4ea', + 'skia_revision': '2f67f1f18562ddd6b43bf7eaca6a17bfcd0a71df', # 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 d11dfcf570..354aa40597 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 5403ba875f3c376fc4909ab25af23332 +Signature: 349f2b2727ab66f3e2b6faa50843433b ==================================================================================================== LIBRARY: etc1 @@ -386,6 +386,8 @@ FILE: ../../../third_party/skia/modules/pathkit/perf/pathops.bench.js FILE: ../../../third_party/skia/modules/pathkit/perf/perfReporter.js FILE: ../../../third_party/skia/modules/skparagraph/test.html FILE: ../../../third_party/skia/package-lock.json +FILE: ../../../third_party/skia/relnotes/mesh.md +FILE: ../../../third_party/skia/relnotes/readbuffer-deserial.md FILE: ../../../third_party/skia/src/gpu/gpu_workaround_list.txt FILE: ../../../third_party/skia/src/ports/fontations/Cargo.toml FILE: ../../../third_party/skia/src/sksl/generated/sksl_compute.minified.sksl @@ -9355,6 +9357,47 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: skia +ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2WGSL.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeBlender.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeColorFilter.cpp + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2WGSL.cpp +FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeBlender.cpp +FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeColorFilter.cpp +---------------------------------------------------------------------------------------------------- +Copyright 2023 Google, LLC + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + * Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +==================================================================================================== + ==================================================================================================== LIBRARY: skia ORIGIN: ../../../third_party/skia/src/shaders/SkCoordClampShader.cpp + ../../../third_party/skia/LICENSE @@ -9392,4 +9435,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== -Total license count: 67 +Total license count: 68 diff --git a/engine/src/flutter/sky/packages/sky_engine/LICENSE b/engine/src/flutter/sky/packages/sky_engine/LICENSE index 37913ed761..09e21e1ec1 100644 --- a/engine/src/flutter/sky/packages/sky_engine/LICENSE +++ b/engine/src/flutter/sky/packages/sky_engine/LICENSE @@ -28118,6 +28118,38 @@ skia Copyright 2023 Google LLC. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + * Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-------------------------------------------------------------------------------- +skia + +Copyright 2023 Google, LLC + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: