From b9133acf04e50a5965db89d9653cd2e33ffc2592 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Fri, 29 May 2020 10:48:02 -0400 Subject: [PATCH] Roll Skia from 22534f2098e7 to 074414fed53e (37 revisions) (flutter/engine#18663) --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 124 +++++++++--------- 2 files changed, 64 insertions(+), 62 deletions(-) diff --git a/DEPS b/DEPS index 2f72e0c1943..32c7afa3a8d 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': '22534f2098e7df401ce6d8498f37fdc36cd8f357', + 'skia_revision': '074414fed53efcab7f33b06454958707419e37d8', # 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 bb91bafb34b..7ab86ddb4e2 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 2edd85aa68c71d777af3d9d81991b923 +Signature: 7c84ecbc906f877b25eb1edcff785a20 UNUSED LICENSES: @@ -1348,6 +1348,7 @@ 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/include/TypefaceFontProvider.h +FILE: ../../../third_party/skia/modules/skparagraph/samples/SampleParagraph.cpp FILE: ../../../third_party/skia/modules/skparagraph/src/Decorations.cpp FILE: ../../../third_party/skia/modules/skparagraph/src/Decorations.h FILE: ../../../third_party/skia/modules/skparagraph/src/FontCollection.cpp @@ -1360,6 +1361,8 @@ FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphCache.cpp 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/ParagraphUtil.cpp +FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphUtil.h 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 @@ -1373,7 +1376,6 @@ FILE: ../../../third_party/skia/modules/skparagraph/test.html FILE: ../../../third_party/skia/modules/skparagraph/utils/TestFontCollection.cpp FILE: ../../../third_party/skia/modules/skparagraph/utils/TestFontCollection.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 @@ -3930,14 +3932,14 @@ FILE: ../../../third_party/skia/src/gpu/GrStencilMaskHelper.cpp FILE: ../../../third_party/skia/src/gpu/GrStencilMaskHelper.h FILE: ../../../third_party/skia/src/gpu/GrUniformDataManager.cpp FILE: ../../../third_party/skia/src/gpu/GrUniformDataManager.h -FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DAttachmentViewManager.cpp -FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DAttachmentViewManager.h FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DBuffer.cpp FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DBuffer.h FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCaps.cpp FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCaps.h FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCommandList.cpp FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCommandList.h +FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCpuDescriptorManager.cpp +FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCpuDescriptorManager.h FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DDescriptorHeap.cpp FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DDescriptorHeap.h FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DGpu.cpp @@ -4016,9 +4018,63 @@ 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 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/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/bench/SkGlyphCacheBench.h FILE: ../../../third_party/skia/docs/examples/Alpha_Constants_a.cpp @@ -5093,6 +5149,7 @@ FILE: ../../../third_party/skia/gm/sample_matrix_constant.cpp FILE: ../../../third_party/skia/gm/sample_matrix_variable.cpp FILE: ../../../third_party/skia/gm/tilemodes_alpha.cpp FILE: ../../../third_party/skia/include/core/SkPathTypes.h +FILE: ../../../third_party/skia/modules/skparagraph/bench/ParagraphBench.cpp FILE: ../../../third_party/skia/modules/skplaintexteditor/app/editor_application.cpp FILE: ../../../third_party/skia/modules/skplaintexteditor/include/editor.h FILE: ../../../third_party/skia/modules/skplaintexteditor/include/stringslice.h @@ -5158,61 +5215,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 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/bench/TessellatePathBench.cpp + ../../../third_party/skia/LICENSE