From 19769b2aa03031ebb6efadec79d68e61008d0d8f Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Mon, 6 Feb 2023 22:26:05 +0000 Subject: [PATCH] Roll Skia from 1bc762cbb8ce to 7e2c9f54c0fd (23 revisions) https://skia.googlesource.com/skia.git/+log/1bc762cbb8ce..7e2c9f54c0fd 2023-02-06 brianosman@google.com Switch back to "legacy" AAA heuristic 2023-02-06 ccameron@chromium.org SkJpegXmp: Consolidate XMP parsing in SkJpegXmp 2023-02-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll SK Tool from 3c1d98cffee9 to 0627f9ef0da0 2023-02-06 nicolettep@google.com [graphite] Define freeGpuData() in VulkanTexture class 2023-02-06 robertphillips@google.com [graphite] Apply colorSpace to runtime effect's uniforms 2023-02-06 robertphillips@google.com [graphite] Apply colorSpace to the gradients' color stops 2023-02-06 jvanverth@google.com Fix overflow in CreateIntegralTable 2023-02-06 johnstiles@google.com Avoid switching between scalar and SIMD in Affine_vpts. 2023-02-06 robertphillips@google.com [graphite] Apply colorSpace to the SkPaint's color 2023-02-06 robertphillips@google.com Make use of existing DM color space functionality 2023-02-06 nicolettep@google.com [graphite] Implement Vulkan CopyBufferToTexture 2023-02-06 herb@google.com Use the right mask action to draw emoji 2023-02-06 bungeman@google.com Remove SK_IGNORE_FIX_FOR_PDF_UNDEFINED_COLOR 2023-02-06 bungeman@google.com Put codec DecoderProc into anonymous namespace 2023-02-06 jamesgk@google.com Manually roll Dawn from 14685aa05bfd to 0b4a2f1f50b8 (25 revisions) 2023-02-06 herb@google.com On RemoteStrike use fSentGlyphs for all types 2023-02-06 brianosman@google.com Clean up naming and standards in RP SkImageShader 2023-02-06 brianosman@google.com Implement linear mipmap filtering in Raster Pipeline 2023-02-06 johnstiles@google.com Replace pop_slots with pop_slots_unmasked when possible. 2023-02-06 johnstiles@google.com Dump ops that span multiple variables correctly. 2023-02-06 johnstiles@google.com Give variables unique names in SkRP dump files. 2023-02-06 johnstiles@google.com Optimize compound-constructors into splats where possible. 2023-02-06 bsalomon@google.com Add shader that clamps the coordinates used to sample another shader. 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 bdero@google.com,brianosman@google.com,kjlubick@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 | 43 ++++++++++++++++++++++++++++++-- sky/packages/sky_engine/LICENSE | 32 ++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 20fb75d993c12..24fa372982a32 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': '1bc762cbb8cea4c202a4dcdfc336f353a1ca85d2', + 'skia_revision': '7e2c9f54c0fd5d777f96e94b958c2ebff5fa246b', # 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 2a57c97cf232a..7e461ef12b77d 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 2c669abba482d29c09631d0af6efbabb +Signature: 6d9e9ec29a5629927a937d3ce8a7360f ==================================================================================================== LIBRARY: etc1 @@ -8908,6 +8908,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia +ORIGIN: ../../../third_party/skia/gm/coordclampshader.cpp + ../../../third_party/skia/LICENSE 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 @@ -8927,6 +8928,7 @@ ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h + ../../../t 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/coordclampshader.cpp FILE: ../../../third_party/skia/gm/imagefiltersunpremul.cpp FILE: ../../../third_party/skia/include/private/SkGainmapInfo.h FILE: ../../../third_party/skia/include/private/SkGainmapShader.h @@ -9058,4 +9060,41 @@ 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: 65 +==================================================================================================== +LIBRARY: skia +ORIGIN: ../../../third_party/skia/src/shaders/SkCoordClampShader.cpp + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/src/shaders/SkCoordClampShader.cpp +---------------------------------------------------------------------------------------------------- +Copyright 2023 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: 66 diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 09eb698c87525..8b982520eb014 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -28018,6 +28018,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 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: