Skip to content

Commit 3ca67ac

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll Skia from e1bfa18fc512 to 2fceb21cb7ce (2 revisions) (flutter#29247)
1 parent c2aa726 commit 3ca67ac

File tree

2 files changed

+114
-111
lines changed

2 files changed

+114
-111
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': 'e1bfa18fc512eaca302bffa2f3d2ad2b6428aecd',
30+
'skia_revision': '2fceb21cb7ce61ffc6bc2e30df9557d39c089ceb',
3131

3232
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
3333
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

‎ci/licenses_golden/licenses_skia‎

Lines changed: 113 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: a3e5153d3b6618f23044fda896450455
1+
Signature: 5d5661b33eb011a13a32251715b2ffea
22

33
UNUSED LICENSES:
44

@@ -2303,6 +2303,8 @@ FILE: ../../../third_party/skia/experimental/graphite/src/TextureProxy.h
23032303
FILE: ../../../third_party/skia/experimental/graphite/src/UniformDataManager.cpp
23042304
FILE: ../../../third_party/skia/experimental/graphite/src/UniformDataManager.h
23052305
FILE: ../../../third_party/skia/experimental/graphite/src/geom/BoundsManager.h
2306+
FILE: ../../../third_party/skia/experimental/graphite/src/geom/IntersectionTree.cpp
2307+
FILE: ../../../third_party/skia/experimental/graphite/src/geom/IntersectionTree.h
23062308
FILE: ../../../third_party/skia/experimental/graphite/src/geom/Rect.h
23072309
FILE: ../../../third_party/skia/experimental/graphite/src/geom/Shape.cpp
23082310
FILE: ../../../third_party/skia/experimental/graphite/src/geom/Shape.h
@@ -4117,115 +4119,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
41174119
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
41184120
====================================================================================================
41194121

4120-
====================================================================================================
4121-
LIBRARY: skia
4122-
ORIGIN: ../../../third_party/skia/bench/MSKPBench.cpp + ../../../third_party/skia/LICENSE
4123-
TYPE: LicenseType.bsd
4124-
FILE: ../../../third_party/skia/bench/MSKPBench.cpp
4125-
FILE: ../../../third_party/skia/bench/MSKPBench.h
4126-
FILE: ../../../third_party/skia/experimental/graphite/include/private/MtlTypesPriv.h
4127-
FILE: ../../../third_party/skia/experimental/graphite/src/Buffer.cpp
4128-
FILE: ../../../third_party/skia/experimental/graphite/src/Buffer.h
4129-
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlBuffer.h
4130-
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlBuffer.mm
4131-
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlRenderCommandEncoder.h
4132-
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlTrampoline.h
4133-
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlTrampoline.mm
4134-
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlUtils.mm
4135-
FILE: ../../../third_party/skia/fuzz/FuzzDDLThreading.cpp
4136-
FILE: ../../../third_party/skia/gm/aarecteffect.cpp
4137-
FILE: ../../../third_party/skia/gm/colorspace.cpp
4138-
FILE: ../../../third_party/skia/gm/drawglyphs.cpp
4139-
FILE: ../../../third_party/skia/gm/largeclippedpath.cpp
4140-
FILE: ../../../third_party/skia/gm/skbug_12212.cpp
4141-
FILE: ../../../third_party/skia/include/private/GrMtlTypesPriv.h
4142-
FILE: ../../../third_party/skia/include/utils/SkOrderedFontMgr.h
4143-
FILE: ../../../third_party/skia/infra/bots/task_drivers/recreate_skps/recreate_skps.go
4144-
FILE: ../../../third_party/skia/modules/androidkit/src/AndroidKit.cpp
4145-
FILE: ../../../third_party/skia/modules/androidkit/src/Canvas.cpp
4146-
FILE: ../../../third_party/skia/modules/androidkit/src/ColorFilters.cpp
4147-
FILE: ../../../third_party/skia/modules/androidkit/src/Font.cpp
4148-
FILE: ../../../third_party/skia/modules/androidkit/src/FontChainAdapter.cpp
4149-
FILE: ../../../third_party/skia/modules/androidkit/src/Gradients.cpp
4150-
FILE: ../../../third_party/skia/modules/androidkit/src/Image.cpp
4151-
FILE: ../../../third_party/skia/modules/androidkit/src/ImageFilter.cpp
4152-
FILE: ../../../third_party/skia/modules/androidkit/src/Matrix.cpp
4153-
FILE: ../../../third_party/skia/modules/androidkit/src/Paint.cpp
4154-
FILE: ../../../third_party/skia/modules/androidkit/src/Path.cpp
4155-
FILE: ../../../third_party/skia/modules/androidkit/src/PathBuilder.cpp
4156-
FILE: ../../../third_party/skia/modules/androidkit/src/RuntimeShaderBuilder.cpp
4157-
FILE: ../../../third_party/skia/modules/androidkit/src/Shader.cpp
4158-
FILE: ../../../third_party/skia/modules/androidkit/src/SkottieAnimation.cpp
4159-
FILE: ../../../third_party/skia/modules/androidkit/src/Surface.cpp
4160-
FILE: ../../../third_party/skia/modules/androidkit/src/Surface.h
4161-
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.cpp
4162-
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.h
4163-
FILE: ../../../third_party/skia/modules/androidkit/src/Text.cpp
4164-
FILE: ../../../third_party/skia/modules/androidkit/src/Utils.cpp
4165-
FILE: ../../../third_party/skia/modules/androidkit/src/Utils.h
4166-
FILE: ../../../third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp
4167-
FILE: ../../../third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
4168-
FILE: ../../../third_party/skia/modules/skottie/src/effects/ThresholdEffect.cpp
4169-
FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu.h
4170-
FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu_builtin.cpp
4171-
FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu_runtime.cpp
4172-
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeImage.h
4173-
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLightSource.h
4174-
FILE: ../../../third_party/skia/modules/svg/include/SkSVGImage.h
4175-
FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h
4176-
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeImage.cpp
4177-
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp
4178-
FILE: ../../../third_party/skia/modules/svg/src/SkSVGImage.cpp
4179-
FILE: ../../../third_party/skia/modules/svg/src/SkSVGMask.cpp
4180-
FILE: ../../../third_party/skia/src/gpu/GrDrawIndirectCommand.h
4181-
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.cpp
4182-
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.h
4183-
FILE: ../../../third_party/skia/src/gpu/GrThreadSafePipelineBuilder.cpp
4184-
FILE: ../../../third_party/skia/src/gpu/GrThreadSafePipelineBuilder.h
4185-
FILE: ../../../third_party/skia/src/gpu/mock/GrMockRenderTask.h
4186-
FILE: ../../../third_party/skia/src/gpu/mock/GrMockSurfaceProxy.h
4187-
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlFramebuffer.h
4188-
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlFramebuffer.mm
4189-
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlPipeline.h
4190-
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlRenderCommandEncoder.h
4191-
FILE: ../../../third_party/skia/src/gpu/ops/AtlasRenderTask.cpp
4192-
FILE: ../../../third_party/skia/src/gpu/ops/AtlasRenderTask.h
4193-
FILE: ../../../third_party/skia/src/gpu/tessellate/CullTest.h
4194-
FILE: ../../../third_party/skia/src/shaders/SkTransformShader.cpp
4195-
FILE: ../../../third_party/skia/src/shaders/SkTransformShader.h
4196-
FILE: ../../../third_party/skia/src/utils/SkOrderedFontMgr.cpp
4197-
----------------------------------------------------------------------------------------------------
4198-
Copyright 2021 Google Inc.
4199-
4200-
Redistribution and use in source and binary forms, with or without
4201-
modification, are permitted provided that the following conditions are
4202-
met:
4203-
4204-
* Redistributions of source code must retain the above copyright
4205-
notice, this list of conditions and the following disclaimer.
4206-
4207-
* Redistributions in binary form must reproduce the above copyright
4208-
notice, this list of conditions and the following disclaimer in
4209-
the documentation and/or other materials provided with the
4210-
distribution.
4211-
4212-
* Neither the name of the copyright holder nor the names of its
4213-
contributors may be used to endorse or promote products derived
4214-
from this software without specific prior written permission.
4215-
4216-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
4217-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
4218-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
4219-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
4220-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
4221-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
4222-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
4223-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
4224-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
4225-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
4226-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4227-
====================================================================================================
4228-
42294122
====================================================================================================
42304123
LIBRARY: skia
42314124
ORIGIN: ../../../third_party/skia/bench/ReadPixBench.cpp + ../../../third_party/skia/LICENSE
@@ -5394,6 +5287,116 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
53945287
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
53955288
====================================================================================================
53965289

5290+
====================================================================================================
5291+
LIBRARY: skia
5292+
ORIGIN: ../../../third_party/skia/bench/graphite/IntersectionTreeBench.cpp + ../../../third_party/skia/LICENSE
5293+
TYPE: LicenseType.bsd
5294+
FILE: ../../../third_party/skia/bench/MSKPBench.cpp
5295+
FILE: ../../../third_party/skia/bench/MSKPBench.h
5296+
FILE: ../../../third_party/skia/bench/graphite/IntersectionTreeBench.cpp
5297+
FILE: ../../../third_party/skia/experimental/graphite/include/private/MtlTypesPriv.h
5298+
FILE: ../../../third_party/skia/experimental/graphite/src/Buffer.cpp
5299+
FILE: ../../../third_party/skia/experimental/graphite/src/Buffer.h
5300+
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlBuffer.h
5301+
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlBuffer.mm
5302+
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlRenderCommandEncoder.h
5303+
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlTrampoline.h
5304+
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlTrampoline.mm
5305+
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlUtils.mm
5306+
FILE: ../../../third_party/skia/fuzz/FuzzDDLThreading.cpp
5307+
FILE: ../../../third_party/skia/gm/aarecteffect.cpp
5308+
FILE: ../../../third_party/skia/gm/colorspace.cpp
5309+
FILE: ../../../third_party/skia/gm/drawglyphs.cpp
5310+
FILE: ../../../third_party/skia/gm/largeclippedpath.cpp
5311+
FILE: ../../../third_party/skia/gm/skbug_12212.cpp
5312+
FILE: ../../../third_party/skia/include/private/GrMtlTypesPriv.h
5313+
FILE: ../../../third_party/skia/include/utils/SkOrderedFontMgr.h
5314+
FILE: ../../../third_party/skia/infra/bots/task_drivers/recreate_skps/recreate_skps.go
5315+
FILE: ../../../third_party/skia/modules/androidkit/src/AndroidKit.cpp
5316+
FILE: ../../../third_party/skia/modules/androidkit/src/Canvas.cpp
5317+
FILE: ../../../third_party/skia/modules/androidkit/src/ColorFilters.cpp
5318+
FILE: ../../../third_party/skia/modules/androidkit/src/Font.cpp
5319+
FILE: ../../../third_party/skia/modules/androidkit/src/FontChainAdapter.cpp
5320+
FILE: ../../../third_party/skia/modules/androidkit/src/Gradients.cpp
5321+
FILE: ../../../third_party/skia/modules/androidkit/src/Image.cpp
5322+
FILE: ../../../third_party/skia/modules/androidkit/src/ImageFilter.cpp
5323+
FILE: ../../../third_party/skia/modules/androidkit/src/Matrix.cpp
5324+
FILE: ../../../third_party/skia/modules/androidkit/src/Paint.cpp
5325+
FILE: ../../../third_party/skia/modules/androidkit/src/Path.cpp
5326+
FILE: ../../../third_party/skia/modules/androidkit/src/PathBuilder.cpp
5327+
FILE: ../../../third_party/skia/modules/androidkit/src/RuntimeShaderBuilder.cpp
5328+
FILE: ../../../third_party/skia/modules/androidkit/src/Shader.cpp
5329+
FILE: ../../../third_party/skia/modules/androidkit/src/SkottieAnimation.cpp
5330+
FILE: ../../../third_party/skia/modules/androidkit/src/Surface.cpp
5331+
FILE: ../../../third_party/skia/modules/androidkit/src/Surface.h
5332+
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.cpp
5333+
FILE: ../../../third_party/skia/modules/androidkit/src/SurfaceThread.h
5334+
FILE: ../../../third_party/skia/modules/androidkit/src/Text.cpp
5335+
FILE: ../../../third_party/skia/modules/androidkit/src/Utils.cpp
5336+
FILE: ../../../third_party/skia/modules/androidkit/src/Utils.h
5337+
FILE: ../../../third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp
5338+
FILE: ../../../third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
5339+
FILE: ../../../third_party/skia/modules/skottie/src/effects/ThresholdEffect.cpp
5340+
FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu.h
5341+
FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu_builtin.cpp
5342+
FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu_runtime.cpp
5343+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeImage.h
5344+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLightSource.h
5345+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGImage.h
5346+
FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h
5347+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeImage.cpp
5348+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp
5349+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGImage.cpp
5350+
FILE: ../../../third_party/skia/modules/svg/src/SkSVGMask.cpp
5351+
FILE: ../../../third_party/skia/src/gpu/GrDrawIndirectCommand.h
5352+
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.cpp
5353+
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.h
5354+
FILE: ../../../third_party/skia/src/gpu/GrThreadSafePipelineBuilder.cpp
5355+
FILE: ../../../third_party/skia/src/gpu/GrThreadSafePipelineBuilder.h
5356+
FILE: ../../../third_party/skia/src/gpu/mock/GrMockRenderTask.h
5357+
FILE: ../../../third_party/skia/src/gpu/mock/GrMockSurfaceProxy.h
5358+
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlFramebuffer.h
5359+
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlFramebuffer.mm
5360+
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlPipeline.h
5361+
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlRenderCommandEncoder.h
5362+
FILE: ../../../third_party/skia/src/gpu/ops/AtlasRenderTask.cpp
5363+
FILE: ../../../third_party/skia/src/gpu/ops/AtlasRenderTask.h
5364+
FILE: ../../../third_party/skia/src/gpu/tessellate/CullTest.h
5365+
FILE: ../../../third_party/skia/src/shaders/SkTransformShader.cpp
5366+
FILE: ../../../third_party/skia/src/shaders/SkTransformShader.h
5367+
FILE: ../../../third_party/skia/src/utils/SkOrderedFontMgr.cpp
5368+
----------------------------------------------------------------------------------------------------
5369+
Copyright 2021 Google Inc.
5370+
5371+
Redistribution and use in source and binary forms, with or without
5372+
modification, are permitted provided that the following conditions are
5373+
met:
5374+
5375+
* Redistributions of source code must retain the above copyright
5376+
notice, this list of conditions and the following disclaimer.
5377+
5378+
* Redistributions in binary form must reproduce the above copyright
5379+
notice, this list of conditions and the following disclaimer in
5380+
the documentation and/or other materials provided with the
5381+
distribution.
5382+
5383+
* Neither the name of the copyright holder nor the names of its
5384+
contributors may be used to endorse or promote products derived
5385+
from this software without specific prior written permission.
5386+
5387+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5388+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5389+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5390+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5391+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5392+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5393+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5394+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5395+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5396+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5397+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5398+
====================================================================================================
5399+
53975400
====================================================================================================
53985401
LIBRARY: skia
53995402
ORIGIN: ../../../third_party/skia/docs/examples/50_percent_gray.cpp + ../../../third_party/skia/LICENSE

0 commit comments

Comments
 (0)