diff --git a/DEPS b/DEPS index cef05ff53f5..b078e2b7860 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': '607c6d9c86ab32ed58c9db9b1e0cf94e0913326f', + 'skia_revision': '5ec1b8ff3f45e5bbd9d21cdf60217e417118d0ed', # 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/engine/src/flutter/ci/licenses_golden/licenses_skia b/engine/src/flutter/ci/licenses_golden/licenses_skia index ebc93975032..c504dd5f23c 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 03bb97e370333f3a6cbb5d0d30f20549 +Signature: c79c692ac50ac8705e449f8e981ec301 UNUSED LICENSES: @@ -1905,7 +1905,6 @@ FILE: ../../../third_party/skia/infra/bots/assets/procdump_win/VERSION FILE: ../../../third_party/skia/infra/bots/assets/protoc/VERSION FILE: ../../../third_party/skia/infra/bots/assets/skimage/VERSION FILE: ../../../third_party/skia/infra/bots/assets/skp/VERSION -FILE: ../../../third_party/skia/infra/bots/assets/skparagraph/VERSION FILE: ../../../third_party/skia/infra/bots/assets/svg/VERSION FILE: ../../../third_party/skia/infra/bots/assets/valgrind/VERSION FILE: ../../../third_party/skia/infra/bots/assets/win_ninja/VERSION @@ -2243,34 +2242,7 @@ FILE: ../../../third_party/skia/modules/pathkit/perf/path.bench.js FILE: ../../../third_party/skia/modules/pathkit/perf/pathops.bench.js FILE: ../../../third_party/skia/modules/pathkit/perf/perfReporter.js FILE: ../../../third_party/skia/modules/pathkit/ready.js -FILE: ../../../third_party/skia/modules/skparagraph/include/DartTypes.h -FILE: ../../../third_party/skia/modules/skparagraph/include/FontCollection.h -FILE: ../../../third_party/skia/modules/skparagraph/include/Paragraph.h -FILE: ../../../third_party/skia/modules/skparagraph/include/ParagraphBuilder.h -FILE: ../../../third_party/skia/modules/skparagraph/include/ParagraphStyle.h -FILE: ../../../third_party/skia/modules/skparagraph/include/TextShadow.h -FILE: ../../../third_party/skia/modules/skparagraph/include/TextStyle.h -FILE: ../../../third_party/skia/modules/skparagraph/src/FontCollection.cpp -FILE: ../../../third_party/skia/modules/skparagraph/src/FontIterator.cpp -FILE: ../../../third_party/skia/modules/skparagraph/src/FontIterator.h -FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.cpp -FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.h -FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphCache.h -FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphImpl.cpp -FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphImpl.h -FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphStyle.cpp -FILE: ../../../third_party/skia/modules/skparagraph/src/Run.cpp -FILE: ../../../third_party/skia/modules/skparagraph/src/Run.h -FILE: ../../../third_party/skia/modules/skparagraph/src/TextLine.cpp -FILE: ../../../third_party/skia/modules/skparagraph/src/TextLine.h -FILE: ../../../third_party/skia/modules/skparagraph/src/TextShadow.cpp -FILE: ../../../third_party/skia/modules/skparagraph/src/TextStyle.cpp -FILE: ../../../third_party/skia/modules/skparagraph/src/TextWrapper.cpp -FILE: ../../../third_party/skia/modules/skparagraph/src/TextWrapper.h -FILE: ../../../third_party/skia/modules/skparagraph/src/TypefaceFontProvider.cpp -FILE: ../../../third_party/skia/modules/skparagraph/src/TypefaceFontProvider.h FILE: ../../../third_party/skia/public.bzl -FILE: ../../../third_party/skia/samplecode/SampleParagraph.cpp FILE: ../../../third_party/skia/site/METADATA FILE: ../../../third_party/skia/site/dev/METADATA FILE: ../../../third_party/skia/site/dev/design/PdfLogicalDocumentStructure.png @@ -4125,9 +4097,61 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia -ORIGIN: ../../../third_party/skia/bench/ParagraphBench.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/bench/ReadPixBench.cpp + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/bench/ReadPixBench.cpp +FILE: ../../../third_party/skia/bench/WriterBench.cpp +FILE: ../../../third_party/skia/include/effects/SkColorFilterImageFilter.h +FILE: ../../../third_party/skia/include/effects/SkLightingImageFilter.h +FILE: ../../../third_party/skia/include/effects/SkMagnifierImageFilter.h +FILE: ../../../third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h +FILE: ../../../third_party/skia/include/effects/SkMergeImageFilter.h +FILE: ../../../third_party/skia/include/effects/SkMorphologyImageFilter.h +FILE: ../../../third_party/skia/include/effects/SkOffsetImageFilter.h +FILE: ../../../third_party/skia/src/core/SkImageFilter.cpp +FILE: ../../../third_party/skia/src/core/SkUtilsArm.cpp +FILE: ../../../third_party/skia/src/effects/imagefilters/SkColorFilterImageFilter.cpp +FILE: ../../../third_party/skia/src/effects/imagefilters/SkLightingImageFilter.cpp +FILE: ../../../third_party/skia/src/effects/imagefilters/SkMagnifierImageFilter.cpp +FILE: ../../../third_party/skia/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp +FILE: ../../../third_party/skia/src/effects/imagefilters/SkMergeImageFilter.cpp +FILE: ../../../third_party/skia/src/effects/imagefilters/SkMorphologyImageFilter.cpp +FILE: ../../../third_party/skia/src/effects/imagefilters/SkOffsetImageFilter.cpp +FILE: ../../../third_party/skia/src/images/SkImageEncoderFns.h +---------------------------------------------------------------------------------------------------- +Copyright 2012 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 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. +==================================================================================================== + +==================================================================================================== +LIBRARY: skia +ORIGIN: ../../../third_party/skia/bench/ShaperBench.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/bench/ParagraphBench.cpp FILE: ../../../third_party/skia/bench/ShaperBench.cpp FILE: ../../../third_party/skia/docs/examples/Alpha_Constants_a.cpp FILE: ../../../third_party/skia/docs/examples/Alpha_Constants_b.cpp @@ -5265,59 +5289,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/bench/ReadPixBench.cpp + ../../../third_party/skia/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/bench/ReadPixBench.cpp -FILE: ../../../third_party/skia/bench/WriterBench.cpp -FILE: ../../../third_party/skia/include/effects/SkColorFilterImageFilter.h -FILE: ../../../third_party/skia/include/effects/SkLightingImageFilter.h -FILE: ../../../third_party/skia/include/effects/SkMagnifierImageFilter.h -FILE: ../../../third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h -FILE: ../../../third_party/skia/include/effects/SkMergeImageFilter.h -FILE: ../../../third_party/skia/include/effects/SkMorphologyImageFilter.h -FILE: ../../../third_party/skia/include/effects/SkOffsetImageFilter.h -FILE: ../../../third_party/skia/src/core/SkImageFilter.cpp -FILE: ../../../third_party/skia/src/core/SkUtilsArm.cpp -FILE: ../../../third_party/skia/src/effects/imagefilters/SkColorFilterImageFilter.cpp -FILE: ../../../third_party/skia/src/effects/imagefilters/SkLightingImageFilter.cpp -FILE: ../../../third_party/skia/src/effects/imagefilters/SkMagnifierImageFilter.cpp -FILE: ../../../third_party/skia/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp -FILE: ../../../third_party/skia/src/effects/imagefilters/SkMergeImageFilter.cpp -FILE: ../../../third_party/skia/src/effects/imagefilters/SkMorphologyImageFilter.cpp -FILE: ../../../third_party/skia/src/effects/imagefilters/SkOffsetImageFilter.cpp -FILE: ../../../third_party/skia/src/images/SkImageEncoderFns.h ----------------------------------------------------------------------------------------------------- -Copyright 2012 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 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. -==================================================================================================== - ==================================================================================================== LIBRARY: skia ORIGIN: ../../../third_party/skia/bench/SkSLBench.cpp + ../../../third_party/skia/LICENSE