Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 258f63a

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll Skia from 5276ba274b38 to 31fddc376993 (14 revisions) (#25862)
1 parent d462cfd commit 258f63a

File tree

2 files changed

+89
-75
lines changed

2 files changed

+89
-75
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ vars = {
2727
'skia_git': 'https://skia.googlesource.com',
2828
# OCMock is for testing only so there is no google clone
2929
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
30-
'skia_revision': '5276ba274b38826e3415326f08607bf6cdc08238',
30+
'skia_revision': '31fddc376993462595b95051fa5e7a7b21ab06a1',
3131

3232
# When updating the Dart revision, ensure that all entries that are
3333
# dependencies of Dart are also updated to match the entries in the

‎ci/licenses_golden/licenses_skia‎

Lines changed: 88 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: c832a11b1394490412830855b34b3368
1+
Signature: fdf33e067d0b435ddacb08955eee3203
22

33
UNUSED LICENSES:
44

@@ -639,10 +639,6 @@ FILE: ../../../third_party/skia/src/gpu/GrSurfaceContext.h
639639
FILE: ../../../third_party/skia/src/gpu/GrSurfaceProxy.cpp
640640
FILE: ../../../third_party/skia/src/gpu/GrSurfaceProxy.h
641641
FILE: ../../../third_party/skia/src/gpu/GrSwizzle.h
642-
FILE: ../../../third_party/skia/src/gpu/GrTextureAdjuster.cpp
643-
FILE: ../../../third_party/skia/src/gpu/GrTextureAdjuster.h
644-
FILE: ../../../third_party/skia/src/gpu/GrTextureProducer.cpp
645-
FILE: ../../../third_party/skia/src/gpu/GrTextureProducer.h
646642
FILE: ../../../third_party/skia/src/gpu/GrTextureProxy.cpp
647643
FILE: ../../../third_party/skia/src/gpu/GrTextureProxy.h
648644
FILE: ../../../third_party/skia/src/gpu/GrTextureRenderTargetProxy.cpp
@@ -1002,6 +998,22 @@ FILE: ../../../third_party/skia/experimental/skottiekit/postamble.js
1002998
FILE: ../../../third_party/skia/experimental/skottiekit/preamble.js
1003999
FILE: ../../../third_party/skia/experimental/skottiekit/release.js
10041000
FILE: ../../../third_party/skia/experimental/skottiekit/skottiekit/package.json
1001+
FILE: ../../../third_party/skia/experimental/sktext/include/Processor.h
1002+
FILE: ../../../third_party/skia/experimental/sktext/include/Types.h
1003+
FILE: ../../../third_party/skia/experimental/sktext/samples/Text.cpp
1004+
FILE: ../../../third_party/skia/experimental/sktext/src/Decorator.cpp
1005+
FILE: ../../../third_party/skia/experimental/sktext/src/Decorator.h
1006+
FILE: ../../../third_party/skia/experimental/sktext/src/Formatter.cpp
1007+
FILE: ../../../third_party/skia/experimental/sktext/src/Formatter.h
1008+
FILE: ../../../third_party/skia/experimental/sktext/src/Line.cpp
1009+
FILE: ../../../third_party/skia/experimental/sktext/src/Line.h
1010+
FILE: ../../../third_party/skia/experimental/sktext/src/Processor.cpp
1011+
FILE: ../../../third_party/skia/experimental/sktext/src/Shaper.cpp
1012+
FILE: ../../../third_party/skia/experimental/sktext/src/Shaper.h
1013+
FILE: ../../../third_party/skia/experimental/sktext/src/TextRun.cpp
1014+
FILE: ../../../third_party/skia/experimental/sktext/src/TextRun.h
1015+
FILE: ../../../third_party/skia/experimental/sktext/src/Wrapper.cpp
1016+
FILE: ../../../third_party/skia/experimental/sktext/src/Wrapper.h
10051017
FILE: ../../../third_party/skia/experimental/tskit/.eslintignore
10061018
FILE: ../../../third_party/skia/experimental/tskit/.eslintrc.js
10071019
FILE: ../../../third_party/skia/experimental/tskit/bindings/core.d.ts
@@ -3925,6 +3937,77 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
39253937
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39263938
====================================================================================================
39273939

3940+
====================================================================================================
3941+
LIBRARY: skia
3942+
ORIGIN: ../../../third_party/skia/bench/MSKPBench.cpp + ../../../third_party/skia/LICENSE
3943+
TYPE: LicenseType.bsd
3944+
FILE: ../../../third_party/skia/bench/MSKPBench.cpp
3945+
FILE: ../../../third_party/skia/bench/MSKPBench.h
3946+
FILE: ../../../third_party/skia/fuzz/FuzzDDLThreading.cpp
3947+
FILE: ../../../third_party/skia/gm/aarecteffect.cpp
3948+
FILE: ../../../third_party/skia/gm/colorspace.cpp
3949+
FILE: ../../../third_party/skia/gm/drawglyphs.cpp
3950+
FILE: ../../../third_party/skia/gm/largeclippedpath.cpp
3951+
FILE: ../../../third_party/skia/include/private/GrMtlTypesPriv.h
3952+
FILE: ../../../third_party/skia/include/utils/SkOrderedFontMgr.h
3953+
FILE: ../../../third_party/skia/modules/androidkit/src/AndroidKit.cpp
3954+
FILE: ../../../third_party/skia/modules/androidkit/src/Canvas.cpp
3955+
FILE: ../../../third_party/skia/modules/androidkit/src/Matrix.cpp
3956+
FILE: ../../../third_party/skia/modules/androidkit/src/Paint.cpp
3957+
FILE: ../../../third_party/skia/modules/androidkit/src/RuntimeShaderBuilder.cpp
3958+
FILE: ../../../third_party/skia/modules/androidkit/src/Shader.cpp
3959+
FILE: ../../../third_party/skia/modules/androidkit/src/Surface.cpp
3960+
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.cpp
3961+
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.h
3962+
FILE: ../../../third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp
3963+
FILE: ../../../third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
3964+
FILE: ../../../third_party/skia/modules/skottie/src/effects/ThresholdEffect.cpp
3965+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLightSource.h
3966+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGImage.h
3967+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h
3968+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp
3969+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGImage.cpp
3970+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGMask.cpp
3971+
FILE: ../../../third_party/skia/src/gpu/GrDrawIndirectCommand.h
3972+
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.cpp
3973+
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.h
3974+
FILE: ../../../third_party/skia/src/gpu/GrThreadSafePipelineBuilder.cpp
3975+
FILE: ../../../third_party/skia/src/gpu/GrThreadSafePipelineBuilder.h
3976+
FILE: ../../../third_party/skia/src/gpu/mock/GrMockRenderTask.h
3977+
FILE: ../../../third_party/skia/src/gpu/mock/GrMockSurfaceProxy.h
3978+
FILE: ../../../third_party/skia/src/utils/SkOrderedFontMgr.cpp
3979+
----------------------------------------------------------------------------------------------------
3980+
Copyright 2021 Google Inc.
3981+
3982+
Redistribution and use in source and binary forms, with or without
3983+
modification, are permitted provided that the following conditions are
3984+
met:
3985+
3986+
* Redistributions of source code must retain the above copyright
3987+
notice, this list of conditions and the following disclaimer.
3988+
3989+
* Redistributions in binary form must reproduce the above copyright
3990+
notice, this list of conditions and the following disclaimer in
3991+
the documentation and/or other materials provided with the
3992+
distribution.
3993+
3994+
* Neither the name of the copyright holder nor the names of its
3995+
contributors may be used to endorse or promote products derived
3996+
from this software without specific prior written permission.
3997+
3998+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
3999+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
4000+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
4001+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
4002+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
4003+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
4004+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
4005+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
4006+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
4007+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
4008+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4009+
====================================================================================================
4010+
39284011
====================================================================================================
39294012
LIBRARY: skia
39304013
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
56755758
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
56765759
====================================================================================================
56775760

5678-
====================================================================================================
5679-
LIBRARY: skia
5680-
ORIGIN: ../../../third_party/skia/fuzz/FuzzDDLThreading.cpp + ../../../third_party/skia/LICENSE
5681-
TYPE: LicenseType.bsd
5682-
FILE: ../../../third_party/skia/fuzz/FuzzDDLThreading.cpp
5683-
FILE: ../../../third_party/skia/gm/aarecteffect.cpp
5684-
FILE: ../../../third_party/skia/gm/colorspace.cpp
5685-
FILE: ../../../third_party/skia/gm/drawglyphs.cpp
5686-
FILE: ../../../third_party/skia/gm/largeclippedpath.cpp
5687-
FILE: ../../../third_party/skia/include/private/GrMtlTypesPriv.h
5688-
FILE: ../../../third_party/skia/include/utils/SkOrderedFontMgr.h
5689-
FILE: ../../../third_party/skia/modules/androidkit/src/AndroidKit.cpp
5690-
FILE: ../../../third_party/skia/modules/androidkit/src/Canvas.cpp
5691-
FILE: ../../../third_party/skia/modules/androidkit/src/Matrix.cpp
5692-
FILE: ../../../third_party/skia/modules/androidkit/src/Paint.cpp
5693-
FILE: ../../../third_party/skia/modules/androidkit/src/RuntimeShaderBuilder.cpp
5694-
FILE: ../../../third_party/skia/modules/androidkit/src/Shader.cpp
5695-
FILE: ../../../third_party/skia/modules/androidkit/src/Surface.cpp
5696-
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.cpp
5697-
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.h
5698-
FILE: ../../../third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp
5699-
FILE: ../../../third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
5700-
FILE: ../../../third_party/skia/modules/skottie/src/effects/ThresholdEffect.cpp
5701-
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLightSource.h
5702-
FILE: ../../../third_party/skia/modules/svg/include/SkSVGImage.h
5703-
FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h
5704-
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp
5705-
FILE: ../../../third_party/skia/modules/svg/src/SkSVGImage.cpp
5706-
FILE: ../../../third_party/skia/modules/svg/src/SkSVGMask.cpp
5707-
FILE: ../../../third_party/skia/src/gpu/GrDrawIndirectCommand.h
5708-
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.cpp
5709-
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.h
5710-
FILE: ../../../third_party/skia/src/gpu/GrThreadSafePipelineBuilder.cpp
5711-
FILE: ../../../third_party/skia/src/gpu/GrThreadSafePipelineBuilder.h
5712-
FILE: ../../../third_party/skia/src/gpu/mock/GrMockRenderTask.h
5713-
FILE: ../../../third_party/skia/src/gpu/mock/GrMockSurfaceProxy.h
5714-
FILE: ../../../third_party/skia/src/utils/SkOrderedFontMgr.cpp
5715-
----------------------------------------------------------------------------------------------------
5716-
Copyright 2021 Google Inc.
5717-
5718-
Redistribution and use in source and binary forms, with or without
5719-
modification, are permitted provided that the following conditions are
5720-
met:
5721-
5722-
* Redistributions of source code must retain the above copyright
5723-
notice, this list of conditions and the following disclaimer.
5724-
5725-
* Redistributions in binary form must reproduce the above copyright
5726-
notice, this list of conditions and the following disclaimer in
5727-
the documentation and/or other materials provided with the
5728-
distribution.
5729-
5730-
* Neither the name of the copyright holder nor the names of its
5731-
contributors may be used to endorse or promote products derived
5732-
from this software without specific prior written permission.
5733-
5734-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5735-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5736-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5737-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5738-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5739-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5740-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5741-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5742-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5743-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5744-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5745-
====================================================================================================
5746-
57475761
====================================================================================================
57485762
LIBRARY: skia
57495763
ORIGIN: ../../../third_party/skia/fuzz/FuzzDrawFunctions.cpp + ../../../third_party/skia/LICENSE

0 commit comments

Comments
 (0)