From fec43d9b6b77bcb638426b8d9e25f9876f0ab5b4 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Thu, 17 Mar 2022 16:12:36 +0000 Subject: [PATCH] Roll Skia from 02ebd1a23381 to 5e035c66da3c (19 revisions) https://skia.googlesource.com/skia.git/+log/02ebd1a23381..5e035c66da3c 2022-03-17 ethannicholas@google.com Added safety checks to SkSL error reporting 2022-03-17 jvanverth@google.com [graphite] Revise UploadTask to allow creation from one UploadInstance 2022-03-17 jvanverth@google.com [graphite] Add budgeted param to SkImage::asView(Recorder,...) 2022-03-17 jvanverth@google.com [graphite] Don't delete MTLDepthStencilState until CommandBuffer is done 2022-03-17 herb@google.com guard against bad sub run count and size hint 2022-03-17 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from 63b54d9d07b5 to 98bb4f32ded0 (11 revisions) 2022-03-17 skia-autoroll@skia-public.iam.gserviceaccount.com Roll SwiftShader from b3b1a3fe8351 to a6c0e4120986 (9 revisions) 2022-03-17 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Dawn from 09681d57ed4b to 2391382b1443 (8 revisions) 2022-03-17 herb@google.com guard against missing paths in Slug deserialization 2022-03-16 armansito@google.com Use destination-space colors in drawFastShadow 2022-03-16 armansito@google.com Bypass color transformation in shadow rendering via drawVertices 2022-03-16 ethannicholas@google.com Fixed a past-the-end error location in SPIR-V output 2022-03-16 johnstiles@google.com Simplify filtering in SkQPRunner. 2022-03-16 johnstiles@google.com Remove obsolete python2 references. 2022-03-16 herb@google.com add testing code for serialized Slugs 2022-03-16 johnstiles@google.com Pass SkSL error tests to SkQP.java via arrays. 2022-03-16 johnstiles@google.com Load the SkSL error tests when SkQP::init is executed. 2022-03-16 johnstiles@google.com Factor out SkQP exclusion-list handling into a helper class. 2022-03-16 scroggo@google.com Update OWNERS.android with more details 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 jsimmons@google.com,scroggo@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 | 88 +++++++++++++++++--------------- sky/packages/sky_engine/LICENSE | 32 ++++++++++++ 3 files changed, 79 insertions(+), 43 deletions(-) diff --git a/DEPS b/DEPS index 55d0afa20faab..63fcbd2394e61 100644 --- a/DEPS +++ b/DEPS @@ -27,7 +27,7 @@ vars = { 'skia_git': 'https://skia.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': '02ebd1a233811de50c2513c2f670cd2ba5ec3f18', + 'skia_revision': '5e035c66da3c1dd91dd43f102ed325a28ecb9baf', # 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 ba7f778ac2361..548faa59d4f4d 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 10366b0d21ed56469d0b39aa163dd8a7 +Signature: a2d5f88d3a481dc51c42790582ef1f9c UNUSED LICENSES: @@ -651,17 +651,8 @@ FILE: ../../../third_party/skia/BUILD.bazel FILE: ../../../third_party/skia/CQ_COMMITTERS FILE: ../../../third_party/skia/DEPS FILE: ../../../third_party/skia/DIR_METADATA +FILE: ../../../third_party/skia/OWNERS.android FILE: ../../../third_party/skia/WORKSPACE.bazel -FILE: ../../../third_party/skia/animations/checkbox.xml -FILE: ../../../third_party/skia/animations/chest#1.jpg -FILE: ../../../third_party/skia/animations/fire#1.jpg -FILE: ../../../third_party/skia/animations/images#1.xml -FILE: ../../../third_party/skia/animations/jet#1.jpg -FILE: ../../../third_party/skia/animations/lines#1.xml -FILE: ../../../third_party/skia/animations/movie#1.xml -FILE: ../../../third_party/skia/animations/paths#1.xml -FILE: ../../../third_party/skia/animations/redcross#1.jpg -FILE: ../../../third_party/skia/animations/text#1.xml FILE: ../../../third_party/skia/bazel/BUILD.bazel FILE: ../../../third_party/skia/bazel/cc_binary_with_flags.bzl FILE: ../../../third_party/skia/bazel/common_config_settings/BUILD.bazel @@ -763,16 +754,6 @@ FILE: ../../../third_party/skia/experimental/tskit/package.json FILE: ../../../third_party/skia/experimental/tskit/tsconfig.json FILE: ../../../third_party/skia/experimental/wasm-hello-world/BUILD.bazel FILE: ../../../third_party/skia/experimental/wasm-hello-world/hello_world.html -FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/cpu.js -FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/debugger/anim.mskp -FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/debugger/index.html -FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/debugger/sample.skp -FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/externs.js -FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/fonts/NotoMono-Regular.ttf -FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/gpu.js -FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/helper.js -FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/karma.conf.js -FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/package.json FILE: ../../../third_party/skia/experimental/webgpu-bazel/example/index.html FILE: ../../../third_party/skia/experimental/webgpu-bazel/src/BUILD FILE: ../../../third_party/skia/gm/BUILD.bazel @@ -803,6 +784,7 @@ FILE: ../../../third_party/skia/include/private/BUILD.bazel FILE: ../../../third_party/skia/include/private/chromium/BUILD.bazel FILE: ../../../third_party/skia/include/sksl/BUILD.bazel FILE: ../../../third_party/skia/include/svg/BUILD.bazel +FILE: ../../../third_party/skia/include/third_party/BUILD.bazel FILE: ../../../third_party/skia/include/utils/BUILD.bazel FILE: ../../../third_party/skia/include/utils/mac/BUILD.bazel FILE: ../../../third_party/skia/infra/bots/BUILD.bazel @@ -1911,7 +1893,6 @@ FILE: ../../../third_party/skia/bench/StreamBench.cpp FILE: ../../../third_party/skia/bench/SwizzleBench.cpp FILE: ../../../third_party/skia/bench/TileImageFilterBench.cpp FILE: ../../../third_party/skia/bench/VertexColorSpaceBench.cpp -FILE: ../../../third_party/skia/experimental/xps_to_png/xps_to_png.cs FILE: ../../../third_party/skia/fuzz/Fuzz.cpp FILE: ../../../third_party/skia/fuzz/Fuzz.h FILE: ../../../third_party/skia/fuzz/FuzzGradients.cpp @@ -3266,7 +3247,7 @@ FILE: ../../../third_party/skia/src/effects/imagefilters/SkComposeImageFilter.cp FILE: ../../../third_party/skia/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp FILE: ../../../third_party/skia/src/effects/imagefilters/SkDropShadowImageFilter.cpp FILE: ../../../third_party/skia/src/effects/imagefilters/SkTileImageFilter.cpp -FILE: ../../../third_party/skia/src/gpu/GrBlend.h +FILE: ../../../third_party/skia/src/gpu/Blend.h FILE: ../../../third_party/skia/src/gpu/GrCaps.h FILE: ../../../third_party/skia/src/gpu/GrGeometryProcessor.h FILE: ../../../third_party/skia/src/gpu/GrPaint.cpp @@ -3345,7 +3326,6 @@ TYPE: LicenseType.bsd FILE: ../../../third_party/skia/bench/BulkRectBench.cpp FILE: ../../../third_party/skia/bench/DDLRecorderBench.cpp FILE: ../../../third_party/skia/bench/SkSLBench.cpp -FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/debugger_bindings.cpp FILE: ../../../third_party/skia/gm/asyncrescaleandread.cpp FILE: ../../../third_party/skia/gm/crbug_908646.cpp FILE: ../../../third_party/skia/gm/crbug_946965.cpp @@ -3465,7 +3445,6 @@ FILE: ../../../third_party/skia/bench/PathOpsBench.cpp FILE: ../../../third_party/skia/bench/PolyUtilsBench.cpp FILE: ../../../third_party/skia/bench/ShaderMaskFilterBench.cpp FILE: ../../../third_party/skia/bench/TypefaceBench.cpp -FILE: ../../../third_party/skia/experimental/pvg/draw_msg.proto FILE: ../../../third_party/skia/fuzz/FuzzCommon.cpp FILE: ../../../third_party/skia/fuzz/FuzzPathMeasure.cpp FILE: ../../../third_party/skia/fuzz/FuzzRegionOp.cpp @@ -4203,21 +4182,6 @@ TYPE: LicenseType.bsd FILE: ../../../third_party/skia/bench/FindCubicConvex180ChopsBench.cpp FILE: ../../../third_party/skia/bench/GlyphQuadFillBench.cpp FILE: ../../../third_party/skia/bench/TessellateBench.cpp -FILE: ../../../third_party/skia/experimental/skrive/include/SkRive.h -FILE: ../../../third_party/skia/experimental/skrive/src/Artboard.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/Color.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/Component.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/Drawable.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/Ellipse.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/Node.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/Paint.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/Rectangle.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/Shape.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/SkRive.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/reader/BinaryReader.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/reader/JsonReader.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/reader/StreamReader.cpp -FILE: ../../../third_party/skia/experimental/skrive/src/reader/StreamReader.h FILE: ../../../third_party/skia/fuzz/FuzzSkParagraph.cpp FILE: ../../../third_party/skia/gm/3d.cpp FILE: ../../../third_party/skia/gm/bc1_transparency.cpp @@ -6127,6 +6091,8 @@ FILE: ../../../third_party/skia/experimental/graphite/src/UploadTask.h FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlSampler.h FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlSampler.mm FILE: ../../../third_party/skia/gm/bug12866.cpp +FILE: ../../../third_party/skia/include/core/SkAlphaType.h +FILE: ../../../third_party/skia/include/core/SkColorType.h FILE: ../../../third_party/skia/include/private/SkUniquePaintParamsID.h FILE: ../../../third_party/skia/src/core/SkBuiltInCodeSnippetID.h FILE: ../../../third_party/skia/src/core/SkDebugUtils.h @@ -6136,6 +6102,8 @@ FILE: ../../../third_party/skia/src/core/SkKeyHelpers.cpp FILE: ../../../third_party/skia/src/core/SkKeyHelpers.h FILE: ../../../third_party/skia/src/core/SkPaintParamsKey.cpp FILE: ../../../third_party/skia/src/core/SkPaintParamsKey.h +FILE: ../../../third_party/skia/src/core/SkPipelineData.cpp +FILE: ../../../third_party/skia/src/core/SkPipelineData.h FILE: ../../../third_party/skia/src/core/SkSLTypeShared.h FILE: ../../../third_party/skia/src/core/SkShaderCodeDictionary.cpp FILE: ../../../third_party/skia/src/core/SkShaderCodeDictionary.h @@ -6213,7 +6181,6 @@ FILE: ../../../third_party/skia/src/gpu/ops/PathStencilCoverOp.h FILE: ../../../third_party/skia/src/gpu/ops/PathTessellateOp.cpp FILE: ../../../third_party/skia/src/gpu/ops/PathTessellateOp.h FILE: ../../../third_party/skia/src/gpu/tessellate/AffineMatrix.h -FILE: ../../../third_party/skia/src/gpu/tessellate/PatchWriter.cpp FILE: ../../../third_party/skia/src/gpu/tessellate/PatchWriter.h FILE: ../../../third_party/skia/src/gpu/tessellate/PathCurveTessellator.cpp FILE: ../../../third_party/skia/src/gpu/tessellate/PathCurveTessellator.h @@ -7933,6 +7900,43 @@ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Materials. ==================================================================================================== +==================================================================================================== +LIBRARY: skia +ORIGIN: ../../../third_party/skia/src/sksl/SkSLPosition.cpp + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/src/sksl/SkSLPosition.cpp +---------------------------------------------------------------------------------------------------- +Copyright 2022 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: vulkanmemoryallocator ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h @@ -7959,4 +7963,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ==================================================================================================== -Total license count: 68 +Total license count: 69 diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index f05e3fc96a532..2bf1d92bd65b5 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -15024,6 +15024,38 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- skia +Copyright 2022 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 2022 The Chromium Authors. All rights reserved. Redistribution and use in source and binary forms, with or without