From 1ef69238dadc88de08c125ef29d307cde01dc267 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Sat, 18 May 2019 09:35:08 -0400 Subject: [PATCH] Roll src/third_party/skia 76346ac952c4..8c6bfe5350cf (2 commits) (flutter/engine#9008) https://skia.googlesource.com/skia.git /%2Blog/76346ac952c4..8c6bfe5350cf git log 76346ac952c4006b41bbc8fd5a41c22a8b6e43b1..8c6bfe5350cf5ba0f4979dc5f13872c09e3ca3cc --date=short --no-merges --format=%ad %ae %s 2019-02-05 rmistry@google.com Whitespace test 2019-05-17 reed@google.com Revert "Revert "Experimental SkVideoDecoder, to wrap calls to ffmpeg"" The AutoRoll server is located here: https://autoroll.skia.org/r/skia-flutter-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff (michaelludwig@google.com), and stop the roller if necessary. --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 217 +++++++++--------- 2 files changed, 111 insertions(+), 108 deletions(-) diff --git a/DEPS b/DEPS index 6594729711..21a24c473f 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': '76346ac952c4006b41bbc8fd5a41c22a8b6e43b1', + 'skia_revision': '8c6bfe5350cf5ba0f4979dc5f13872c09e3ca3cc', # 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 a80eb35bf9..8425e24af9 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: cf020cc928c928d8a52f2005e605c257 +Signature: 1d8e170077ac3a297ae44c11265299c6 UNUSED LICENSES: @@ -5333,6 +5333,115 @@ 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/experimental/ffmpeg/SkVideoDecoder.cpp + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/experimental/ffmpeg/SkVideoDecoder.cpp +FILE: ../../../third_party/skia/experimental/ffmpeg/SkVideoDecoder.h +FILE: ../../../third_party/skia/gm/backdrop.cpp +FILE: ../../../third_party/skia/gm/backdrop_imagefilter_croprect.cpp +FILE: ../../../third_party/skia/gm/compositor_quads.cpp +FILE: ../../../third_party/skia/gm/crbug_938592.cpp +FILE: ../../../third_party/skia/gm/crbug_947055.cpp +FILE: ../../../third_party/skia/gm/mac_aa_explorer.cpp +FILE: ../../../third_party/skia/gm/mixercolorfilter.cpp +FILE: ../../../third_party/skia/gm/overdrawcanvas.cpp +FILE: ../../../third_party/skia/gm/postercircle.cpp +FILE: ../../../third_party/skia/gm/samplelocations.cpp +FILE: ../../../third_party/skia/gm/skbug_8664.cpp +FILE: ../../../third_party/skia/gm/skbug_8955.cpp +FILE: ../../../third_party/skia/gm/video_decoder.cpp +FILE: ../../../third_party/skia/include/core/SkTileMode.h +FILE: ../../../third_party/skia/include/gpu/GrContextThreadSafeProxy.h +FILE: ../../../third_party/skia/include/private/GrContext_Base.h +FILE: ../../../third_party/skia/include/private/GrImageContext.h +FILE: ../../../third_party/skia/include/private/GrRecordingContext.h +FILE: ../../../third_party/skia/include/private/SkVx.h +FILE: ../../../third_party/skia/modules/skottie/src/text/SkottieShaper.cpp +FILE: ../../../third_party/skia/modules/skottie/src/text/SkottieShaper.h +FILE: ../../../third_party/skia/modules/skottie/src/text/TextAdapter.cpp +FILE: ../../../third_party/skia/modules/skottie/src/text/TextAdapter.h +FILE: ../../../third_party/skia/modules/skottie/src/text/TextValue.cpp +FILE: ../../../third_party/skia/modules/skottie/src/text/TextValue.h +FILE: ../../../third_party/skia/modules/sksg/include/SkSGRenderEffect.h +FILE: ../../../third_party/skia/modules/sksg/src/SkSGRenderEffect.cpp +FILE: ../../../third_party/skia/modules/sksg/src/SkSGTransformPriv.h +FILE: ../../../third_party/skia/samplecode/SampleDegenerateQuads.cpp +FILE: ../../../third_party/skia/samplecode/SampleSG.cpp +FILE: ../../../third_party/skia/samplecode/SampleThinAA.cpp +FILE: ../../../third_party/skia/src/codec/SkScalingCodec.h +FILE: ../../../third_party/skia/src/core/SkDescriptor.cpp +FILE: ../../../third_party/skia/src/core/SkEffectPriv.h +FILE: ../../../third_party/skia/src/core/SkStrikeInterface.h +FILE: ../../../third_party/skia/src/core/SkStrikeSpec.h +FILE: ../../../third_party/skia/src/gpu/GrAHardwareBufferUtils.cpp +FILE: ../../../third_party/skia/src/gpu/GrAHardwareBufferUtils.h +FILE: ../../../third_party/skia/src/gpu/GrBaseContextPriv.h +FILE: ../../../third_party/skia/src/gpu/GrBuffer.h +FILE: ../../../third_party/skia/src/gpu/GrContextPriv.cpp +FILE: ../../../third_party/skia/src/gpu/GrContextThreadSafeProxy.cpp +FILE: ../../../third_party/skia/src/gpu/GrContext_Base.cpp +FILE: ../../../third_party/skia/src/gpu/GrCpuBuffer.h +FILE: ../../../third_party/skia/src/gpu/GrGpuBuffer.cpp +FILE: ../../../third_party/skia/src/gpu/GrGpuBuffer.h +FILE: ../../../third_party/skia/src/gpu/GrImageContext.cpp +FILE: ../../../third_party/skia/src/gpu/GrImageContextPriv.h +FILE: ../../../third_party/skia/src/gpu/GrRecordingContext.cpp +FILE: ../../../third_party/skia/src/gpu/GrRecordingContextPriv.h +FILE: ../../../third_party/skia/src/gpu/GrSamplePatternDictionary.cpp +FILE: ../../../third_party/skia/src/gpu/GrSamplePatternDictionary.h +FILE: ../../../third_party/skia/src/gpu/ccpr/GrGSCoverageProcessor.h +FILE: ../../../third_party/skia/src/gpu/ccpr/GrOctoBounds.cpp +FILE: ../../../third_party/skia/src/gpu/ccpr/GrOctoBounds.h +FILE: ../../../third_party/skia/src/gpu/ccpr/GrVSCoverageProcessor.h +FILE: ../../../third_party/skia/src/gpu/effects/GrMixerEffect.fp +FILE: ../../../third_party/skia/src/gpu/effects/GrOverrideInputFragmentProcessor.fp +FILE: ../../../third_party/skia/src/gpu/effects/generated/GrMixerEffect.cpp +FILE: ../../../third_party/skia/src/gpu/effects/generated/GrMixerEffect.h +FILE: ../../../third_party/skia/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp +FILE: ../../../third_party/skia/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.h +FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCommandBuffer.h +FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCommandBuffer.mm +FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlDepthStencil.h +FILE: ../../../third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp +FILE: ../../../third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h +FILE: ../../../third_party/skia/src/sksl/SkSLDefines.h +FILE: ../../../third_party/skia/src/sksl/SkSLOutputStream.cpp +FILE: ../../../third_party/skia/src/utils/SkCharToGlyphCache.cpp +FILE: ../../../third_party/skia/src/utils/SkCharToGlyphCache.h +FILE: ../../../third_party/skia/src/utils/SkShaperJSONWriter.cpp +FILE: ../../../third_party/skia/src/utils/SkShaperJSONWriter.h +---------------------------------------------------------------------------------------------------- +Copyright 2019 Google Inc. + +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/experimental/wasm-skp-debugger/debugger_bindings.cpp + ../../../third_party/skia/LICENSE @@ -5570,112 +5679,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/gm/backdrop.cpp + ../../../third_party/skia/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/gm/backdrop.cpp -FILE: ../../../third_party/skia/gm/backdrop_imagefilter_croprect.cpp -FILE: ../../../third_party/skia/gm/compositor_quads.cpp -FILE: ../../../third_party/skia/gm/crbug_938592.cpp -FILE: ../../../third_party/skia/gm/crbug_947055.cpp -FILE: ../../../third_party/skia/gm/mac_aa_explorer.cpp -FILE: ../../../third_party/skia/gm/mixercolorfilter.cpp -FILE: ../../../third_party/skia/gm/overdrawcanvas.cpp -FILE: ../../../third_party/skia/gm/postercircle.cpp -FILE: ../../../third_party/skia/gm/samplelocations.cpp -FILE: ../../../third_party/skia/gm/skbug_8664.cpp -FILE: ../../../third_party/skia/gm/skbug_8955.cpp -FILE: ../../../third_party/skia/include/core/SkTileMode.h -FILE: ../../../third_party/skia/include/gpu/GrContextThreadSafeProxy.h -FILE: ../../../third_party/skia/include/private/GrContext_Base.h -FILE: ../../../third_party/skia/include/private/GrImageContext.h -FILE: ../../../third_party/skia/include/private/GrRecordingContext.h -FILE: ../../../third_party/skia/include/private/SkVx.h -FILE: ../../../third_party/skia/modules/skottie/src/text/SkottieShaper.cpp -FILE: ../../../third_party/skia/modules/skottie/src/text/SkottieShaper.h -FILE: ../../../third_party/skia/modules/skottie/src/text/TextAdapter.cpp -FILE: ../../../third_party/skia/modules/skottie/src/text/TextAdapter.h -FILE: ../../../third_party/skia/modules/skottie/src/text/TextValue.cpp -FILE: ../../../third_party/skia/modules/skottie/src/text/TextValue.h -FILE: ../../../third_party/skia/modules/sksg/include/SkSGRenderEffect.h -FILE: ../../../third_party/skia/modules/sksg/src/SkSGRenderEffect.cpp -FILE: ../../../third_party/skia/modules/sksg/src/SkSGTransformPriv.h -FILE: ../../../third_party/skia/samplecode/SampleDegenerateQuads.cpp -FILE: ../../../third_party/skia/samplecode/SampleSG.cpp -FILE: ../../../third_party/skia/samplecode/SampleThinAA.cpp -FILE: ../../../third_party/skia/src/codec/SkScalingCodec.h -FILE: ../../../third_party/skia/src/core/SkDescriptor.cpp -FILE: ../../../third_party/skia/src/core/SkEffectPriv.h -FILE: ../../../third_party/skia/src/core/SkStrikeInterface.h -FILE: ../../../third_party/skia/src/core/SkStrikeSpec.h -FILE: ../../../third_party/skia/src/gpu/GrAHardwareBufferUtils.cpp -FILE: ../../../third_party/skia/src/gpu/GrAHardwareBufferUtils.h -FILE: ../../../third_party/skia/src/gpu/GrBaseContextPriv.h -FILE: ../../../third_party/skia/src/gpu/GrBuffer.h -FILE: ../../../third_party/skia/src/gpu/GrContextPriv.cpp -FILE: ../../../third_party/skia/src/gpu/GrContextThreadSafeProxy.cpp -FILE: ../../../third_party/skia/src/gpu/GrContext_Base.cpp -FILE: ../../../third_party/skia/src/gpu/GrCpuBuffer.h -FILE: ../../../third_party/skia/src/gpu/GrGpuBuffer.cpp -FILE: ../../../third_party/skia/src/gpu/GrGpuBuffer.h -FILE: ../../../third_party/skia/src/gpu/GrImageContext.cpp -FILE: ../../../third_party/skia/src/gpu/GrImageContextPriv.h -FILE: ../../../third_party/skia/src/gpu/GrRecordingContext.cpp -FILE: ../../../third_party/skia/src/gpu/GrRecordingContextPriv.h -FILE: ../../../third_party/skia/src/gpu/GrSamplePatternDictionary.cpp -FILE: ../../../third_party/skia/src/gpu/GrSamplePatternDictionary.h -FILE: ../../../third_party/skia/src/gpu/ccpr/GrGSCoverageProcessor.h -FILE: ../../../third_party/skia/src/gpu/ccpr/GrOctoBounds.cpp -FILE: ../../../third_party/skia/src/gpu/ccpr/GrOctoBounds.h -FILE: ../../../third_party/skia/src/gpu/ccpr/GrVSCoverageProcessor.h -FILE: ../../../third_party/skia/src/gpu/effects/GrMixerEffect.fp -FILE: ../../../third_party/skia/src/gpu/effects/GrOverrideInputFragmentProcessor.fp -FILE: ../../../third_party/skia/src/gpu/effects/generated/GrMixerEffect.cpp -FILE: ../../../third_party/skia/src/gpu/effects/generated/GrMixerEffect.h -FILE: ../../../third_party/skia/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp -FILE: ../../../third_party/skia/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.h -FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCommandBuffer.h -FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCommandBuffer.mm -FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlDepthStencil.h -FILE: ../../../third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp -FILE: ../../../third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h -FILE: ../../../third_party/skia/src/sksl/SkSLDefines.h -FILE: ../../../third_party/skia/src/sksl/SkSLOutputStream.cpp -FILE: ../../../third_party/skia/src/utils/SkCharToGlyphCache.cpp -FILE: ../../../third_party/skia/src/utils/SkCharToGlyphCache.h -FILE: ../../../third_party/skia/src/utils/SkShaperJSONWriter.cpp -FILE: ../../../third_party/skia/src/utils/SkShaperJSONWriter.h ----------------------------------------------------------------------------------------------------- -Copyright 2019 Google Inc. - -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/gm/circles.cpp + ../../../third_party/skia/LICENSE