From f3e2b99c1a82e2f789ba2d4b0c52ae8921eb4e64 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Mon, 21 Dec 2020 19:29:01 -0500 Subject: [PATCH] Roll Skia from c3622f43c189 to 960bd2dbaa6a (3 revisions) (#23227) --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 6 +-- sky/packages/sky_engine/LICENSE | 91 +++++++++++++++++++++----------- 3 files changed, 65 insertions(+), 34 deletions(-) diff --git a/DEPS b/DEPS index 6387a1f80e6..11cb14c5410 100644 --- a/DEPS +++ b/DEPS @@ -26,7 +26,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': 'c3622f43c189f97b15deded174aab58a699588ac', + 'skia_revision': '960bd2dbaa6a2130330c5f693e2a07a24aeca392', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 2d28f324560..821bcf4645a 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 2c42673e1ba39cb29f2b52338370efeb +Signature: f4012dfaa40018209db8f4daf402a80f UNUSED LICENSES: @@ -1474,8 +1474,8 @@ FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.dehydrated.sksl FILE: ../../../third_party/skia/src/sksl/generated/sksl_geom.dehydrated.sksl FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.dehydrated.sksl FILE: ../../../third_party/skia/src/sksl/generated/sksl_interp.dehydrated.sksl -FILE: ../../../third_party/skia/src/sksl/generated/sksl_pipeline.dehydrated.sksl FILE: ../../../third_party/skia/src/sksl/generated/sksl_public.dehydrated.sksl +FILE: ../../../third_party/skia/src/sksl/generated/sksl_runtime.dehydrated.sksl FILE: ../../../third_party/skia/src/sksl/generated/sksl_vert.dehydrated.sksl FILE: ../../../third_party/skia/src/sksl/lex/sksl.lex FILE: ../../../third_party/skia/src/sksl/sksl_fp_raw.sksl @@ -1483,8 +1483,8 @@ FILE: ../../../third_party/skia/src/sksl/sksl_frag.sksl FILE: ../../../third_party/skia/src/sksl/sksl_geom.sksl FILE: ../../../third_party/skia/src/sksl/sksl_gpu.sksl FILE: ../../../third_party/skia/src/sksl/sksl_interp.sksl -FILE: ../../../third_party/skia/src/sksl/sksl_pipeline.sksl FILE: ../../../third_party/skia/src/sksl/sksl_public.sksl +FILE: ../../../third_party/skia/src/sksl/sksl_runtime.sksl FILE: ../../../third_party/skia/src/sksl/sksl_vert.sksl ---------------------------------------------------------------------------------------------------- Copyright (c) 2011 Google Inc. All rights reserved. diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 6dc2230eaf4..5664e7e1e74 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -502,6 +502,36 @@ limitations under the License. -------------------------------------------------------------------------------- accessibility +Copyright (c) 2009 The Chromium Authors. All rights reserved. + +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 Google Inc. 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. +-------------------------------------------------------------------------------- +accessibility + Copyright (c) 2017 The Chromium Authors. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -578,6 +608,37 @@ distribution. 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. +-------------------------------------------------------------------------------- +accessibility +angle + +Copyright (c) 2013 The Chromium Authors. All rights reserved. + +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 Google Inc. 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 @@ -1000,36 +1061,6 @@ SOFTWARE. -------------------------------------------------------------------------------- angle -Copyright (c) 2013 The Chromium Authors. All rights reserved. - -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 Google Inc. 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 (c) 2019 The ANGLE Project Authors. All rights reserved. Redistribution and use in source and binary forms, with or without