From 519c25e33a619454892116f821a33238b305630f Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Mon, 30 Jan 2023 20:11:26 +0000 Subject: [PATCH] Roll Skia from 59dcffca9061 to 3c4cd77c5e5d (22 revisions) https://skia.googlesource.com/skia.git/+log/59dcffca9061..3c4cd77c5e5d 2023-01-30 kjlubick@google.com Replace Pathops in Geometry::ChopMonoCubic implementation 2023-01-30 kjlubick@google.com [base] Add SkBezierCubic::subdivide 2023-01-30 johnstiles@google.com Add atan2_ primitive to SkRasterPipeline. 2023-01-30 johnstiles@google.com Add atan_ primitive to SkRasterPipeline. 2023-01-30 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from be674ea25e15 to be2b5b119b13 (4 revisions) 2023-01-30 robertphillips@google.com Repurpose sorttoy to filterfuzz 2023-01-30 jvanverth@google.com Fix UBSAN report in SkM44::Perspective. 2023-01-30 kjlubick@google.com Fetch and use ninja when building Skia Release Docker image 2023-01-30 brianosman@google.com Revert "SkJpegCodec: Add SkJpegSourceMgr" 2023-01-30 ccameron@chromium.org Add SkJpegGainmapEncoder::EncodeJpegR and EncodeHDRGM 2023-01-30 herb@google.com Remove single use of commonFilterLoop 2023-01-30 bsalomon@google.com Remove use of SkMatrixProvider in SkShaderBase::appendRootStages 2023-01-30 herb@google.com Have prepare mask drawing do position mapping 2023-01-30 johnstiles@google.com Simplify do-while loops that do not use `continue`. 2023-01-30 johnstiles@google.com Add mechanism for recycling temp slots. 2023-01-30 johnstiles@google.com Simplify for-loops with straight-line control flow. 2023-01-30 johnstiles@google.com Change branch-if-all-lanes-equal to branch-if-no-active-lanes-equal. 2023-01-30 johnstiles@google.com Track loop returns in addition to continue/break. 2023-01-30 ccameron@chromium.org SkJpegCodec: Add SkJpegSourceMgr 2023-01-30 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 9988b37a3351 to be674ea25e15 (1 revision) 2023-01-30 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from 1d9b8d802eb2 to 0cde45b7cbcc (12 revisions) 2023-01-30 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Dawn from b2ec2c350576 to e8168a177ab2 (7 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 jamesgk@google.com,zra@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 | 51 +++++++++++++++++++++++++++++--- sky/packages/sky_engine/LICENSE | 32 ++++++++++++++++++++ 3 files changed, 80 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 661b5cfbb64a4..b19a79a22d8d1 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': '59dcffca90618578a6f9522dbad7c500a98884a1', + 'skia_revision': '3c4cd77c5e5dbb61a6dccfa9e37c23f151bc0b8d', # 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 755f64170cbf1..d7cda02d9a349 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 97be3fa871d462a5424a9cd3b6a78bad +Signature: d0753b5051de59e255fb63bdb451b9d6 ==================================================================================================== LIBRARY: etc1 @@ -2189,6 +2189,43 @@ 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/src/base/SkBezierCurves.cpp + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/src/base/SkBezierCurves.cpp +---------------------------------------------------------------------------------------------------- +Copyright 2012 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/core/SkImageFilter.cpp + ../../../third_party/skia/LICENSE @@ -8872,6 +8909,7 @@ LIBRARY: skia ORIGIN: ../../../third_party/skia/gm/imagefiltersunpremul.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/SkGainmapInfo.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/SkGainmapShader.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/private/SkJpegGainmapEncoder.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkJpegGainmap.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkJpegGainmap.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkJpegMultiPicture.cpp + ../../../third_party/skia/LICENSE @@ -8880,11 +8918,13 @@ ORIGIN: ../../../third_party/skia/src/codec/SkJpegSegmentScan.cpp + ../../../thi ORIGIN: ../../../third_party/skia/src/codec/SkJpegSegmentScan.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpContexts.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/images/SkJpegGainmapEncoder.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/shaders/SkGainmapShader.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/skia/gm/imagefiltersunpremul.cpp FILE: ../../../third_party/skia/include/private/SkGainmapInfo.h FILE: ../../../third_party/skia/include/private/SkGainmapShader.h +FILE: ../../../third_party/skia/include/private/SkJpegGainmapEncoder.h FILE: ../../../third_party/skia/src/codec/SkJpegGainmap.cpp FILE: ../../../third_party/skia/src/codec/SkJpegGainmap.h FILE: ../../../third_party/skia/src/codec/SkJpegMultiPicture.cpp @@ -8893,6 +8933,7 @@ FILE: ../../../third_party/skia/src/codec/SkJpegSegmentScan.cpp FILE: ../../../third_party/skia/src/codec/SkJpegSegmentScan.h FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpContexts.h FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h +FILE: ../../../third_party/skia/src/images/SkJpegGainmapEncoder.cpp FILE: ../../../third_party/skia/src/shaders/SkGainmapShader.cpp ---------------------------------------------------------------------------------------------------- Copyright 2023 Google Inc. @@ -8933,6 +8974,7 @@ ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicQuadRoots.cpp + ../../. ORIGIN: ../../../third_party/skia/include/private/SkMalloc.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/SkTemplates.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/base/SkCPUTypes.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/base/SkBezierCurves.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkCubics.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkCubics.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkFloatingPoint.cpp + ../../../third_party/skia/LICENSE @@ -8942,8 +8984,8 @@ ORIGIN: ../../../third_party/skia/src/base/SkSafeMath.cpp + ../../../third_party ORIGIN: ../../../third_party/skia/src/core/SkTSearch.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLGetReturnComplexity.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLHasContinueOrBreak.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/skia/fuzz/FuzzCubicQuadRoots.cpp @@ -8951,6 +8993,7 @@ FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicQuadRoots.cpp FILE: ../../../third_party/skia/include/private/SkMalloc.h FILE: ../../../third_party/skia/include/private/SkTemplates.h FILE: ../../../third_party/skia/include/private/base/SkCPUTypes.h +FILE: ../../../third_party/skia/src/base/SkBezierCurves.h FILE: ../../../third_party/skia/src/base/SkCubics.cpp FILE: ../../../third_party/skia/src/base/SkCubics.h FILE: ../../../third_party/skia/src/base/SkFloatingPoint.cpp @@ -8960,8 +9003,8 @@ FILE: ../../../third_party/skia/src/base/SkSafeMath.cpp FILE: ../../../third_party/skia/src/core/SkTSearch.h FILE: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.cpp FILE: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.h +FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo.cpp FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetReturnComplexity.cpp -FILE: ../../../third_party/skia/src/sksl/analysis/SkSLHasContinueOrBreak.cpp FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression.cpp ---------------------------------------------------------------------------------------------------- Copyright 2023 Google LLC @@ -8995,4 +9038,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: 64 +Total license count: 65 diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index da243d1bc3cb0..e5ebdcd89c278 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -25282,6 +25282,38 @@ 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 2012 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. +-------------------------------------------------------------------------------- angle Copyright 2012 The ANGLE Project Authors. All rights reserved.