DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Roll Skia from 5276ba274b38 to 31fddc376993 (14 revisions) (flutter/engine#25862)

Browse Source
This commit is contained in:
skia-flutter-autoroll 2021-04-30 18:19:01 -04:00 committed by GitHub
parent b09dbac3d5
commit bab326a795
2 changed files with 89 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -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': '5276ba274b38826e3415326f08607bf6cdc08238',
'skia_revision': '31fddc376993462595b95051fa5e7a7b21ab06a1',
# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the

162
engine/src/flutter/ci/licenses_golden/licenses_skia
View File

@ -1,4 +1,4 @@
Signature: c832a11b1394490412830855b34b3368
Signature: fdf33e067d0b435ddacb08955eee3203
UNUSED LICENSES:
@ -639,10 +639,6 @@ FILE: ../../../third_party/skia/src/gpu/GrSurfaceContext.h
FILE: ../../../third_party/skia/src/gpu/GrSurfaceProxy.cpp
FILE: ../../../third_party/skia/src/gpu/GrSurfaceProxy.h
FILE: ../../../third_party/skia/src/gpu/GrSwizzle.h
FILE: ../../../third_party/skia/src/gpu/GrTextureAdjuster.cpp
FILE: ../../../third_party/skia/src/gpu/GrTextureAdjuster.h
FILE: ../../../third_party/skia/src/gpu/GrTextureProducer.cpp
FILE: ../../../third_party/skia/src/gpu/GrTextureProducer.h
FILE: ../../../third_party/skia/src/gpu/GrTextureProxy.cpp
FILE: ../../../third_party/skia/src/gpu/GrTextureProxy.h
FILE: ../../../third_party/skia/src/gpu/GrTextureRenderTargetProxy.cpp
@ -1002,6 +998,22 @@ FILE: ../../../third_party/skia/experimental/skottiekit/postamble.js
FILE: ../../../third_party/skia/experimental/skottiekit/preamble.js
FILE: ../../../third_party/skia/experimental/skottiekit/release.js
FILE: ../../../third_party/skia/experimental/skottiekit/skottiekit/package.json
FILE: ../../../third_party/skia/experimental/sktext/include/Processor.h
FILE: ../../../third_party/skia/experimental/sktext/include/Types.h
FILE: ../../../third_party/skia/experimental/sktext/samples/Text.cpp
FILE: ../../../third_party/skia/experimental/sktext/src/Decorator.cpp
FILE: ../../../third_party/skia/experimental/sktext/src/Decorator.h
FILE: ../../../third_party/skia/experimental/sktext/src/Formatter.cpp
FILE: ../../../third_party/skia/experimental/sktext/src/Formatter.h
FILE: ../../../third_party/skia/experimental/sktext/src/Line.cpp
FILE: ../../../third_party/skia/experimental/sktext/src/Line.h
FILE: ../../../third_party/skia/experimental/sktext/src/Processor.cpp
FILE: ../../../third_party/skia/experimental/sktext/src/Shaper.cpp
FILE: ../../../third_party/skia/experimental/sktext/src/Shaper.h
FILE: ../../../third_party/skia/experimental/sktext/src/TextRun.cpp
FILE: ../../../third_party/skia/experimental/sktext/src/TextRun.h
FILE: ../../../third_party/skia/experimental/sktext/src/Wrapper.cpp
FILE: ../../../third_party/skia/experimental/sktext/src/Wrapper.h
FILE: ../../../third_party/skia/experimental/tskit/.eslintignore
FILE: ../../../third_party/skia/experimental/tskit/.eslintrc.js
FILE: ../../../third_party/skia/experimental/tskit/bindings/core.d.ts
@ -3925,6 +3937,77 @@ 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/MSKPBench.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/bench/MSKPBench.cpp
FILE: ../../../third_party/skia/bench/MSKPBench.h
FILE: ../../../third_party/skia/fuzz/FuzzDDLThreading.cpp
FILE: ../../../third_party/skia/gm/aarecteffect.cpp
FILE: ../../../third_party/skia/gm/colorspace.cpp
FILE: ../../../third_party/skia/gm/drawglyphs.cpp
FILE: ../../../third_party/skia/gm/largeclippedpath.cpp
FILE: ../../../third_party/skia/include/private/GrMtlTypesPriv.h
FILE: ../../../third_party/skia/include/utils/SkOrderedFontMgr.h
FILE: ../../../third_party/skia/modules/androidkit/src/AndroidKit.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Canvas.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Matrix.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Paint.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/RuntimeShaderBuilder.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Shader.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Surface.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.h
FILE: ../../../third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp
FILE: ../../../third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
FILE: ../../../third_party/skia/modules/skottie/src/effects/ThresholdEffect.cpp
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLightSource.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGImage.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGImage.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGMask.cpp
FILE: ../../../third_party/skia/src/gpu/GrDrawIndirectCommand.h
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.cpp
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.h
FILE: ../../../third_party/skia/src/gpu/GrThreadSafePipelineBuilder.cpp
FILE: ../../../third_party/skia/src/gpu/GrThreadSafePipelineBuilder.h
FILE: ../../../third_party/skia/src/gpu/mock/GrMockRenderTask.h
FILE: ../../../third_party/skia/src/gpu/mock/GrMockSurfaceProxy.h
FILE: ../../../third_party/skia/src/utils/SkOrderedFontMgr.cpp
----------------------------------------------------------------------------------------------------
Copyright 2021 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 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/ReadPixBench.cpp + ../../../third_party/skia/LICENSE
@ -5675,75 +5758,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/fuzz/FuzzDDLThreading.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/fuzz/FuzzDDLThreading.cpp
FILE: ../../../third_party/skia/gm/aarecteffect.cpp
FILE: ../../../third_party/skia/gm/colorspace.cpp
FILE: ../../../third_party/skia/gm/drawglyphs.cpp
FILE: ../../../third_party/skia/gm/largeclippedpath.cpp
FILE: ../../../third_party/skia/include/private/GrMtlTypesPriv.h
FILE: ../../../third_party/skia/include/utils/SkOrderedFontMgr.h
FILE: ../../../third_party/skia/modules/androidkit/src/AndroidKit.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Canvas.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Matrix.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Paint.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/RuntimeShaderBuilder.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Shader.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/Surface.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.cpp
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.h
FILE: ../../../third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp
FILE: ../../../third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
FILE: ../../../third_party/skia/modules/skottie/src/effects/ThresholdEffect.cpp
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLightSource.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGImage.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGImage.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGMask.cpp
FILE: ../../../third_party/skia/src/gpu/GrDrawIndirectCommand.h
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.cpp
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.h
FILE: ../../../third_party/skia/src/gpu/GrThreadSafePipelineBuilder.cpp
FILE: ../../../third_party/skia/src/gpu/GrThreadSafePipelineBuilder.h
FILE: ../../../third_party/skia/src/gpu/mock/GrMockRenderTask.h
FILE: ../../../third_party/skia/src/gpu/mock/GrMockSurfaceProxy.h
FILE: ../../../third_party/skia/src/utils/SkOrderedFontMgr.cpp
----------------------------------------------------------------------------------------------------
Copyright 2021 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 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/fuzz/FuzzDrawFunctions.cpp + ../../../third_party/skia/LICENSE