From 4011ed9d150158f68b84fdca557026b84a6b0a2c Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Tue, 27 Feb 2024 16:33:57 +0000 Subject: [PATCH] Roll Skia from d5ca52bc7739 to 636e136b0da9 (8 revisions) https://skia.googlesource.com/skia.git/+log/d5ca52bc7739..636e136b0da9 2024-02-27 jlavrova@google.com Reland "Implementing Fontations font scanner" 2024-02-27 johnstiles@google.com Manually roll Dawn to the latest version. 2024-02-27 johnstiles@google.com Delete legacy shadeSpan implementation of Perlin Noise. 2024-02-27 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from cc25d8806a33 to 32b3df0d7dd6 (5 revisions) 2024-02-27 kjlubick@google.com Minor clang tidy/format fixes 2024-02-27 michaelludwig@google.com Reland "[skif] Add transparent padding to source saveLayers" 2024-02-27 kjlubick@google.com Enforce IWYU on skottie and sksg 2024-02-27 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from acba61cb3e27 to f0af4730d927 (10 revisions) 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 aaclarke@google.com,brianosman@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://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 44 ++++++++++++++++++++++++++++++-- sky/packages/sky_engine/LICENSE | 34 +++++++++++++++++++++++- 3 files changed, 76 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index ce4fc7ce795b0..f39be22be408a 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ vars = { 'flutter_git': 'https://flutter.googlesource.com', 'skia_git': 'https://skia.googlesource.com', 'llvm_git': 'https://llvm.googlesource.com', - 'skia_revision': 'd5ca52bc77391c3653f7e26e901d9b1344243d48', + 'skia_revision': '636e136b0da9ccb4d7bad34cec84db4801b9a94a', # 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 85b559c171b37..993bfd34f3bc9 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: e169773a87d151cbfa74676d3827c84c +Signature: d0e2dbd80825ebc06e20c50dda9b9f38 ==================================================================================================== LIBRARY: etc1 @@ -397,6 +397,7 @@ FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html FILE: ../../../flutter/third_party/skia/package-lock.json FILE: ../../../flutter/third_party/skia/relnotes/FilterColorDeprecated.md +FILE: ../../../flutter/third_party/skia/relnotes/PerlinNoise.md FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl @@ -9553,4 +9554,43 @@ 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: 69 +==================================================================================================== +LIBRARY: skia +ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.cpp + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.h + ../../../flutter/third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.cpp +FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.h +---------------------------------------------------------------------------------------------------- +Copyright 2024 The Android Open Source Project + +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. +==================================================================================================== + +Total license count: 70 diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index a5bb820a410a6..8ae17315842a2 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -28674,6 +28674,38 @@ skia Copyright 2024 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 2024 The Android Open Source Project + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -31704,7 +31736,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/67b2a250747b9c25c64b901ffbf17bdf36987331 +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/be6be2b9ba6e7352edc509cd8358caad6c199ee5 /third_party/fallback_root_certificates/ --------------------------------------------------------------------------------