From 8a4e08f526eab3a65fbbd3cc38edc094ee252fe5 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Tue, 13 Sep 2022 18:56:14 -0400 Subject: [PATCH] Roll Skia from f8bdc700c877 to 9b0a150cd08d (2 revisions) (flutter/engine#36134) --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 105 +++++++++--------- 2 files changed, 54 insertions(+), 53 deletions(-) diff --git a/DEPS b/DEPS index 561e45ef88c..236ff8a1587 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': 'f8bdc700c8770064b0bde0cb29c9a6cd38c3392e', + 'skia_revision': '9b0a150cd08d1504366fe68b338835a0068dbb15', # 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 77decb1082a..da01cc405aa 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: c26371adbcf9f69f2057199d1634f67b +Signature: 0dc56958c9f9249ab9a70e813d4e3f14 UNUSED LICENSES: @@ -6585,6 +6585,58 @@ 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/gm/tilemodes_subset.cpp + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/gm/tilemodes_subset.cpp +FILE: ../../../third_party/skia/include/gpu/graphite/vk/VulkanGraphiteTypes.h +FILE: ../../../third_party/skia/include/gpu/vk/VulkanExtensions.h +FILE: ../../../third_party/skia/include/gpu/vk/VulkanMemoryAllocator.h +FILE: ../../../third_party/skia/include/gpu/vk/VulkanTypes.h +FILE: ../../../third_party/skia/include/private/gpu/graphite/VulkanGraphiteTypesPriv.h +FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp +FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h +FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp +FILE: ../../../third_party/skia/src/gpu/piet/PietTypes.h +FILE: ../../../third_party/skia/src/gpu/piet/Render.cpp +FILE: ../../../third_party/skia/src/gpu/piet/Render.h +FILE: ../../../third_party/skia/src/gpu/piet/Scene.cpp +FILE: ../../../third_party/skia/src/gpu/piet/Scene.h +FILE: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h +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: skia ORIGIN: ../../../third_party/skia/include/config/SkUserConfig.h + ../../../third_party/skia/LICENSE @@ -7084,57 +7136,6 @@ 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/include/gpu/graphite/vk/VulkanGraphiteTypes.h + ../../../third_party/skia/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/include/gpu/graphite/vk/VulkanGraphiteTypes.h -FILE: ../../../third_party/skia/include/gpu/vk/VulkanExtensions.h -FILE: ../../../third_party/skia/include/gpu/vk/VulkanMemoryAllocator.h -FILE: ../../../third_party/skia/include/gpu/vk/VulkanTypes.h -FILE: ../../../third_party/skia/include/private/gpu/graphite/VulkanGraphiteTypesPriv.h -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h -FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp -FILE: ../../../third_party/skia/src/gpu/piet/PietTypes.h -FILE: ../../../third_party/skia/src/gpu/piet/Render.cpp -FILE: ../../../third_party/skia/src/gpu/piet/Render.h -FILE: ../../../third_party/skia/src/gpu/piet/Scene.cpp -FILE: ../../../third_party/skia/src/gpu/piet/Scene.h -FILE: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h -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: skia ORIGIN: ../../../third_party/skia/include/utils/SkEventTracer.h + ../../../third_party/skia/LICENSE