From 445cbd749ca7c436fff77facc880f8d3155826fe Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Mon, 28 Oct 2019 15:43:24 -0400 Subject: [PATCH] Roll src/third_party/skia 18f5b1a6dd77..1beb8ae9a2f5 (9 commits) (flutter/engine#13392) https://skia.googlesource.com/skia.git/+log/18f5b1a6dd77..1beb8ae9a2f5 git log 18f5b1a6dd77..1beb8ae9a2f5 --date=short --no-merges --format='%ad %ae %s' 2019-10-28 michaelludwig@google.com Reland "Add variety of bulk API benchmarks" 2019-10-28 ethannicholas@google.com Revert "Revert "Rename gl_SampleMask to sk_SampleMask"" 2019-10-28 bsalomon@google.com Remove legacy async read pixels APIs. 2019-10-28 mtklein@google.com experimental support for go/fibers 2019-10-28 robertphillips@google.com Add helper to determine the index buffer that will be used 2019-10-28 jcgregorio@google.com Revert "Add variety of bulk API benchmarks" 2019-10-28 kjlubick@google.com [canvaskit] Use skia's version of png and zlib 2019-10-28 michaelludwig@google.com Add variety of bulk API benchmarks 2019-10-28 kjlubick@google.com [canvaskit] Use newer freetype Created with: gclient setdep -r src/third_party/skia@1beb8ae9a2f5 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC jcgregorio@google.com on the revert to ensure that a human is aware of the problem. To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md Bug: None TBR=jcgregorio@google.com --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 253 +++++++++--------- 2 files changed, 128 insertions(+), 127 deletions(-) diff --git a/DEPS b/DEPS index 43df8575777..846478a0a52 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': '18f5b1a6dd77adcb52ff70a4ae8139167de92b48', + 'skia_revision': '1beb8ae9a2f5a81b65c02a25592e109b9865d608', # 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 816e96be68c..7c2720e417c 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: fb3ffa8d92b72649f0c7c5dd25c90ba8 +Signature: 59915216b18ceb1fdd2c82420005d336 UNUSED LICENSES: @@ -3243,6 +3243,132 @@ 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/BulkRectBench.cpp + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/bench/BulkRectBench.cpp +FILE: ../../../third_party/skia/bench/DDLRecorderBench.cpp +FILE: ../../../third_party/skia/bench/SkSLBench.cpp +FILE: ../../../third_party/skia/bench/SkSLInterpreterBench.cpp +FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/debugger_bindings.cpp +FILE: ../../../third_party/skia/gm/asyncrescaleandread.cpp +FILE: ../../../third_party/skia/gm/crbug_908646.cpp +FILE: ../../../third_party/skia/gm/crbug_946965.cpp +FILE: ../../../third_party/skia/gm/patharcto.cpp +FILE: ../../../third_party/skia/gm/runtimecolorfilter.cpp +FILE: ../../../third_party/skia/gm/runtimefunctions.cpp +FILE: ../../../third_party/skia/gm/runtimeshader.cpp +FILE: ../../../third_party/skia/gm/skbug_9319.cpp +FILE: ../../../third_party/skia/include/effects/SkImageFilters.h +FILE: ../../../third_party/skia/include/gpu/gl/GrGLAssembleHelpers.h +FILE: ../../../third_party/skia/include/private/GrGLTypesPriv.h +FILE: ../../../third_party/skia/include/private/SkThreadAnnotations.h +FILE: ../../../third_party/skia/modules/canvaskit/WasmAliases.h +FILE: ../../../third_party/skia/modules/canvaskit/paragraph_bindings.cpp +FILE: ../../../third_party/skia/modules/canvaskit/particles_bindings.cpp +FILE: ../../../third_party/skia/modules/canvaskit/skottie_bindings.cpp +FILE: ../../../third_party/skia/modules/particles/include/SkParticleBinding.h +FILE: ../../../third_party/skia/modules/particles/include/SkParticleData.h +FILE: ../../../third_party/skia/modules/particles/include/SkParticleDrawable.h +FILE: ../../../third_party/skia/modules/particles/include/SkParticleEffect.h +FILE: ../../../third_party/skia/modules/particles/include/SkParticleSerialization.h +FILE: ../../../third_party/skia/modules/particles/include/SkReflected.h +FILE: ../../../third_party/skia/modules/particles/src/SkParticleBinding.cpp +FILE: ../../../third_party/skia/modules/particles/src/SkParticleDrawable.cpp +FILE: ../../../third_party/skia/modules/particles/src/SkParticleEffect.cpp +FILE: ../../../third_party/skia/modules/particles/src/SkReflected.cpp +FILE: ../../../third_party/skia/samplecode/SampleBackdropBounds.cpp +FILE: ../../../third_party/skia/samplecode/SampleImageFilterDAG.cpp +FILE: ../../../third_party/skia/src/core/SkColorFilterPriv.h +FILE: ../../../third_party/skia/src/core/SkImageFilterTypes.cpp +FILE: ../../../third_party/skia/src/core/SkImageFilterTypes.h +FILE: ../../../third_party/skia/src/core/SkImageFilter_Base.h +FILE: ../../../third_party/skia/src/core/SkVM.cpp +FILE: ../../../third_party/skia/src/core/SkVM.h +FILE: ../../../third_party/skia/src/effects/imagefilters/SkImageFilters.cpp +FILE: ../../../third_party/skia/src/gpu/GrClientMappedBufferManager.cpp +FILE: ../../../third_party/skia/src/gpu/GrClientMappedBufferManager.h +FILE: ../../../third_party/skia/src/gpu/GrCopyRenderTask.cpp +FILE: ../../../third_party/skia/src/gpu/GrCopyRenderTask.h +FILE: ../../../third_party/skia/src/gpu/GrImageInfo.h +FILE: ../../../third_party/skia/src/gpu/GrProgramInfo.cpp +FILE: ../../../third_party/skia/src/gpu/GrProgramInfo.h +FILE: ../../../third_party/skia/src/gpu/GrRenderTask.cpp +FILE: ../../../third_party/skia/src/gpu/GrRenderTask.h +FILE: ../../../third_party/skia/src/gpu/GrShaderUtils.cpp +FILE: ../../../third_party/skia/src/gpu/GrShaderUtils.h +FILE: ../../../third_party/skia/src/gpu/GrSurfaceProxyView.h +FILE: ../../../third_party/skia/src/gpu/GrSwizzle.cpp +FILE: ../../../third_party/skia/src/gpu/GrTextureResolveManager.h +FILE: ../../../third_party/skia/src/gpu/GrTextureResolveRenderTask.cpp +FILE: ../../../third_party/skia/src/gpu/GrTextureResolveRenderTask.h +FILE: ../../../third_party/skia/src/gpu/GrTransferFromRenderTask.cpp +FILE: ../../../third_party/skia/src/gpu/GrTransferFromRenderTask.h +FILE: ../../../third_party/skia/src/gpu/GrUtil.h +FILE: ../../../third_party/skia/src/gpu/GrWaitRenderTask.cpp +FILE: ../../../third_party/skia/src/gpu/GrWaitRenderTask.h +FILE: ../../../third_party/skia/src/gpu/effects/GrColorMatrixFragmentProcessor.fp +FILE: ../../../third_party/skia/src/gpu/effects/GrHSLToRGBFilterEffect.fp +FILE: ../../../third_party/skia/src/gpu/effects/GrRGBToHSLFilterEffect.fp +FILE: ../../../third_party/skia/src/gpu/effects/GrSaturateProcessor.fp +FILE: ../../../third_party/skia/src/gpu/effects/generated/GrColorMatrixFragmentProcessor.cpp +FILE: ../../../third_party/skia/src/gpu/effects/generated/GrColorMatrixFragmentProcessor.h +FILE: ../../../third_party/skia/src/gpu/effects/generated/GrHSLToRGBFilterEffect.cpp +FILE: ../../../third_party/skia/src/gpu/effects/generated/GrHSLToRGBFilterEffect.h +FILE: ../../../third_party/skia/src/gpu/effects/generated/GrRGBToHSLFilterEffect.cpp +FILE: ../../../third_party/skia/src/gpu/effects/generated/GrRGBToHSLFilterEffect.h +FILE: ../../../third_party/skia/src/gpu/effects/generated/GrSaturateProcessor.cpp +FILE: ../../../third_party/skia/src/gpu/effects/generated/GrSaturateProcessor.h +FILE: ../../../third_party/skia/src/gpu/geometry/GrQuadBuffer.h +FILE: ../../../third_party/skia/src/gpu/geometry/GrQuadUtils.cpp +FILE: ../../../third_party/skia/src/gpu/geometry/GrQuadUtils.h +FILE: ../../../third_party/skia/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp +FILE: ../../../third_party/skia/src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp +FILE: ../../../third_party/skia/src/gpu/gl/GrGLAssembleHelpers.cpp +FILE: ../../../third_party/skia/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp +FILE: ../../../third_party/skia/src/gpu/gl/GrGLTypesPriv.cpp +FILE: ../../../third_party/skia/src/gpu/mock/GrMockCaps.cpp +FILE: ../../../third_party/skia/src/gpu/mock/GrMockTypes.cpp +FILE: ../../../third_party/skia/src/sksl/SkSLASTFile.h +FILE: ../../../third_party/skia/src/sksl/SkSLASTNode.cpp +FILE: ../../../third_party/skia/src/sksl/SkSLASTNode.h +FILE: ../../../third_party/skia/src/sksl/SkSLByteCode.h +FILE: ../../../third_party/skia/src/sksl/SkSLByteCodeGenerator.cpp +FILE: ../../../third_party/skia/src/sksl/SkSLByteCodeGenerator.h +FILE: ../../../third_party/skia/src/sksl/SkSLExternalValue.h +FILE: ../../../third_party/skia/src/sksl/ir/SkSLExternalFunctionCall.h +FILE: ../../../third_party/skia/src/sksl/ir/SkSLExternalValueReference.h +---------------------------------------------------------------------------------------------------- +Copyright 2019 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 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/CTConvertBench.cpp + ../../../third_party/skia/LICENSE @@ -3778,131 +3904,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/DDLRecorderBench.cpp + ../../../third_party/skia/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/bench/DDLRecorderBench.cpp -FILE: ../../../third_party/skia/bench/SkSLBench.cpp -FILE: ../../../third_party/skia/bench/SkSLInterpreterBench.cpp -FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/debugger_bindings.cpp -FILE: ../../../third_party/skia/gm/asyncrescaleandread.cpp -FILE: ../../../third_party/skia/gm/crbug_908646.cpp -FILE: ../../../third_party/skia/gm/crbug_946965.cpp -FILE: ../../../third_party/skia/gm/patharcto.cpp -FILE: ../../../third_party/skia/gm/runtimecolorfilter.cpp -FILE: ../../../third_party/skia/gm/runtimefunctions.cpp -FILE: ../../../third_party/skia/gm/runtimeshader.cpp -FILE: ../../../third_party/skia/gm/skbug_9319.cpp -FILE: ../../../third_party/skia/include/effects/SkImageFilters.h -FILE: ../../../third_party/skia/include/gpu/gl/GrGLAssembleHelpers.h -FILE: ../../../third_party/skia/include/private/GrGLTypesPriv.h -FILE: ../../../third_party/skia/include/private/SkThreadAnnotations.h -FILE: ../../../third_party/skia/modules/canvaskit/WasmAliases.h -FILE: ../../../third_party/skia/modules/canvaskit/paragraph_bindings.cpp -FILE: ../../../third_party/skia/modules/canvaskit/particles_bindings.cpp -FILE: ../../../third_party/skia/modules/canvaskit/skottie_bindings.cpp -FILE: ../../../third_party/skia/modules/particles/include/SkParticleBinding.h -FILE: ../../../third_party/skia/modules/particles/include/SkParticleData.h -FILE: ../../../third_party/skia/modules/particles/include/SkParticleDrawable.h -FILE: ../../../third_party/skia/modules/particles/include/SkParticleEffect.h -FILE: ../../../third_party/skia/modules/particles/include/SkParticleSerialization.h -FILE: ../../../third_party/skia/modules/particles/include/SkReflected.h -FILE: ../../../third_party/skia/modules/particles/src/SkParticleBinding.cpp -FILE: ../../../third_party/skia/modules/particles/src/SkParticleDrawable.cpp -FILE: ../../../third_party/skia/modules/particles/src/SkParticleEffect.cpp -FILE: ../../../third_party/skia/modules/particles/src/SkReflected.cpp -FILE: ../../../third_party/skia/samplecode/SampleBackdropBounds.cpp -FILE: ../../../third_party/skia/samplecode/SampleImageFilterDAG.cpp -FILE: ../../../third_party/skia/src/core/SkColorFilterPriv.h -FILE: ../../../third_party/skia/src/core/SkImageFilterTypes.cpp -FILE: ../../../third_party/skia/src/core/SkImageFilterTypes.h -FILE: ../../../third_party/skia/src/core/SkImageFilter_Base.h -FILE: ../../../third_party/skia/src/core/SkVM.cpp -FILE: ../../../third_party/skia/src/core/SkVM.h -FILE: ../../../third_party/skia/src/effects/imagefilters/SkImageFilters.cpp -FILE: ../../../third_party/skia/src/gpu/GrClientMappedBufferManager.cpp -FILE: ../../../third_party/skia/src/gpu/GrClientMappedBufferManager.h -FILE: ../../../third_party/skia/src/gpu/GrCopyRenderTask.cpp -FILE: ../../../third_party/skia/src/gpu/GrCopyRenderTask.h -FILE: ../../../third_party/skia/src/gpu/GrImageInfo.h -FILE: ../../../third_party/skia/src/gpu/GrProgramInfo.cpp -FILE: ../../../third_party/skia/src/gpu/GrProgramInfo.h -FILE: ../../../third_party/skia/src/gpu/GrRenderTask.cpp -FILE: ../../../third_party/skia/src/gpu/GrRenderTask.h -FILE: ../../../third_party/skia/src/gpu/GrShaderUtils.cpp -FILE: ../../../third_party/skia/src/gpu/GrShaderUtils.h -FILE: ../../../third_party/skia/src/gpu/GrSurfaceProxyView.h -FILE: ../../../third_party/skia/src/gpu/GrSwizzle.cpp -FILE: ../../../third_party/skia/src/gpu/GrTextureResolveManager.h -FILE: ../../../third_party/skia/src/gpu/GrTextureResolveRenderTask.cpp -FILE: ../../../third_party/skia/src/gpu/GrTextureResolveRenderTask.h -FILE: ../../../third_party/skia/src/gpu/GrTransferFromRenderTask.cpp -FILE: ../../../third_party/skia/src/gpu/GrTransferFromRenderTask.h -FILE: ../../../third_party/skia/src/gpu/GrUtil.h -FILE: ../../../third_party/skia/src/gpu/GrWaitRenderTask.cpp -FILE: ../../../third_party/skia/src/gpu/GrWaitRenderTask.h -FILE: ../../../third_party/skia/src/gpu/effects/GrColorMatrixFragmentProcessor.fp -FILE: ../../../third_party/skia/src/gpu/effects/GrHSLToRGBFilterEffect.fp -FILE: ../../../third_party/skia/src/gpu/effects/GrRGBToHSLFilterEffect.fp -FILE: ../../../third_party/skia/src/gpu/effects/GrSaturateProcessor.fp -FILE: ../../../third_party/skia/src/gpu/effects/generated/GrColorMatrixFragmentProcessor.cpp -FILE: ../../../third_party/skia/src/gpu/effects/generated/GrColorMatrixFragmentProcessor.h -FILE: ../../../third_party/skia/src/gpu/effects/generated/GrHSLToRGBFilterEffect.cpp -FILE: ../../../third_party/skia/src/gpu/effects/generated/GrHSLToRGBFilterEffect.h -FILE: ../../../third_party/skia/src/gpu/effects/generated/GrRGBToHSLFilterEffect.cpp -FILE: ../../../third_party/skia/src/gpu/effects/generated/GrRGBToHSLFilterEffect.h -FILE: ../../../third_party/skia/src/gpu/effects/generated/GrSaturateProcessor.cpp -FILE: ../../../third_party/skia/src/gpu/effects/generated/GrSaturateProcessor.h -FILE: ../../../third_party/skia/src/gpu/geometry/GrQuadBuffer.h -FILE: ../../../third_party/skia/src/gpu/geometry/GrQuadUtils.cpp -FILE: ../../../third_party/skia/src/gpu/geometry/GrQuadUtils.h -FILE: ../../../third_party/skia/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp -FILE: ../../../third_party/skia/src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp -FILE: ../../../third_party/skia/src/gpu/gl/GrGLAssembleHelpers.cpp -FILE: ../../../third_party/skia/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp -FILE: ../../../third_party/skia/src/gpu/gl/GrGLTypesPriv.cpp -FILE: ../../../third_party/skia/src/gpu/mock/GrMockCaps.cpp -FILE: ../../../third_party/skia/src/gpu/mock/GrMockTypes.cpp -FILE: ../../../third_party/skia/src/sksl/SkSLASTFile.h -FILE: ../../../third_party/skia/src/sksl/SkSLASTNode.cpp -FILE: ../../../third_party/skia/src/sksl/SkSLASTNode.h -FILE: ../../../third_party/skia/src/sksl/SkSLByteCode.h -FILE: ../../../third_party/skia/src/sksl/SkSLByteCodeGenerator.cpp -FILE: ../../../third_party/skia/src/sksl/SkSLByteCodeGenerator.h -FILE: ../../../third_party/skia/src/sksl/SkSLExternalValue.h -FILE: ../../../third_party/skia/src/sksl/ir/SkSLExternalFunctionCall.h -FILE: ../../../third_party/skia/src/sksl/ir/SkSLExternalValueReference.h ----------------------------------------------------------------------------------------------------- -Copyright 2019 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 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/ParagraphBench.cpp + ../../../third_party/skia/LICENSE