From 08f39f7c13ebb709f5d44dc637dd59d74004ceb8 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Tue, 2 Feb 2021 20:06:01 -0500 Subject: [PATCH] Roll Skia from ee9cb6aec35d to 9ff7b8d67559 (10 revisions) (#24148) --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 5 ++++- sky/packages/sky_engine/LICENSE | 30 ++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 10dc78e3259..9f2bf16e715 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': 'ee9cb6aec35dbf25e76295cf6b20ebc7b95bd1b1', + 'skia_revision': '9ff7b8d675591ad2ca8bdbb9cfbd30cdef0f146c', # 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 d1354df6d21..dfe9bd2ddfc 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 4adf1ff9a764aa44446ebadcbf569e10 +Signature: eb0449cfccfed2cb80f91b56684b05a3 UNUSED LICENSES: @@ -5980,6 +5980,7 @@ ORIGIN: ../../../third_party/skia/gm/colorspace.cpp + ../../../third_party/skia/ TYPE: LicenseType.bsd FILE: ../../../third_party/skia/gm/colorspace.cpp FILE: ../../../third_party/skia/gm/largeclippedpath.cpp +FILE: ../../../third_party/skia/modules/skottie/src/effects/SphereEffect.cpp FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLightSource.h FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp @@ -7260,6 +7261,8 @@ FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.cpp FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.h FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.h +FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLFPs.cpp +FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLFPs.h FILE: ../../../third_party/skia/src/sksl/ir/SkSLVariable.cpp ---------------------------------------------------------------------------------------------------- Copyright 2021 Google LLC. diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 199bcf80221..3e60c790389 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -518,6 +518,36 @@ 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 + +Copyright (c) 2014 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