Skip to content

Commit e9e6362

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll Skia from 66deeb27162c to 310178c7b790 (2 revisions) (flutter#27747)
1 parent f210943 commit e9e6362

File tree

2 files changed

+125
-124
lines changed

2 files changed

+125
-124
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': '66deeb27162c100351b002372f6a0ff96d0e73f6',
30+
'skia_revision': '310178c7b790115eeba32c281f8b92d78890b513',
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: 124 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 598875ef3246e2e6f844b526d981d786
1+
Signature: c8401f22a1e9dfae5871e612cdfd8f3f
22

33
UNUSED LICENSES:
44

@@ -2939,6 +2939,129 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29392939
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29402940
====================================================================================================
29412941

2942+
====================================================================================================
2943+
LIBRARY: skia
2944+
ORIGIN: ../../../third_party/skia/bench/CanvasSaveRestoreBench.cpp + ../../../third_party/skia/LICENSE
2945+
TYPE: LicenseType.bsd
2946+
FILE: ../../../third_party/skia/bench/CanvasSaveRestoreBench.cpp
2947+
FILE: ../../../third_party/skia/bench/TriangulatorBench.cpp
2948+
FILE: ../../../third_party/skia/experimental/tskit/bindings/bindings.h
2949+
FILE: ../../../third_party/skia/experimental/tskit/bindings/core.cpp
2950+
FILE: ../../../third_party/skia/experimental/tskit/bindings/extension.cpp
2951+
FILE: ../../../third_party/skia/gm/composecolorfilter.cpp
2952+
FILE: ../../../third_party/skia/gm/crbug_1167277.cpp
2953+
FILE: ../../../third_party/skia/gm/crbug_1174186.cpp
2954+
FILE: ../../../third_party/skia/gm/crbug_1174354.cpp
2955+
FILE: ../../../third_party/skia/gm/crbug_1177833.cpp
2956+
FILE: ../../../third_party/skia/gm/lazytiling.cpp
2957+
FILE: ../../../third_party/skia/gm/particles.cpp
2958+
FILE: ../../../third_party/skia/gm/runtimeeffectimage.cpp
2959+
FILE: ../../../third_party/skia/include/core/SkBlender.h
2960+
FILE: ../../../third_party/skia/include/effects/SkBlenders.h
2961+
FILE: ../../../third_party/skia/include/gpu/gl/egl/GrGLMakeEGLInterface.h
2962+
FILE: ../../../third_party/skia/include/gpu/gl/glx/GrGLMakeGLXInterface.h
2963+
FILE: ../../../third_party/skia/include/sksl/DSLSymbols.h
2964+
FILE: ../../../third_party/skia/modules/canvaskit/paragraph_bindings_gen.cpp
2965+
FILE: ../../../third_party/skia/src/core/SkBlendModeBlender.cpp
2966+
FILE: ../../../third_party/skia/src/core/SkBlendModeBlender.h
2967+
FILE: ../../../third_party/skia/src/core/SkBlenderBase.h
2968+
FILE: ../../../third_party/skia/src/core/SkMatrixInvert.cpp
2969+
FILE: ../../../third_party/skia/src/core/SkMatrixInvert.h
2970+
FILE: ../../../third_party/skia/src/core/SkVMBlitter.h
2971+
FILE: ../../../third_party/skia/src/core/SkYUVAInfoLocation.h
2972+
FILE: ../../../third_party/skia/src/effects/SkBlenders.cpp
2973+
FILE: ../../../third_party/skia/src/effects/imagefilters/SkRuntimeImageFilter.cpp
2974+
FILE: ../../../third_party/skia/src/effects/imagefilters/SkRuntimeImageFilter.h
2975+
FILE: ../../../third_party/skia/src/gpu/BaseDevice.cpp
2976+
FILE: ../../../third_party/skia/src/gpu/BaseDevice.h
2977+
FILE: ../../../third_party/skia/src/gpu/GrDstProxyView.h
2978+
FILE: ../../../third_party/skia/src/gpu/GrEagerVertexAllocator.cpp
2979+
FILE: ../../../third_party/skia/src/gpu/GrInnerFanTriangulator.h
2980+
FILE: ../../../third_party/skia/src/gpu/GrMeshDrawTarget.cpp
2981+
FILE: ../../../third_party/skia/src/gpu/GrMeshDrawTarget.h
2982+
FILE: ../../../third_party/skia/src/gpu/GrOpsTypes.h
2983+
FILE: ../../../third_party/skia/src/gpu/GrPersistentCacheUtils.cpp
2984+
FILE: ../../../third_party/skia/src/gpu/GrSubRunAllocator.cpp
2985+
FILE: ../../../third_party/skia/src/gpu/GrSubRunAllocator.h
2986+
FILE: ../../../third_party/skia/src/gpu/GrWritePixelsRenderTask.cpp
2987+
FILE: ../../../third_party/skia/src/gpu/GrWritePixelsRenderTask.h
2988+
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.cpp
2989+
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.h
2990+
FILE: ../../../third_party/skia/src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp
2991+
FILE: ../../../third_party/skia/src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp
2992+
FILE: ../../../third_party/skia/src/gpu/v2/Device.cpp
2993+
FILE: ../../../third_party/skia/src/gpu/v2/Device_v2.h
2994+
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.cpp
2995+
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.h
2996+
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
2997+
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h
2998+
FILE: ../../../third_party/skia/src/sksl/SkSLContext.cpp
2999+
FILE: ../../../third_party/skia/src/sksl/SkSLIntrinsicList.h
3000+
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.h
3001+
FILE: ../../../third_party/skia/src/sksl/SkSLOperators.cpp
3002+
FILE: ../../../third_party/skia/src/sksl/SkSLOperators.h
3003+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLBinaryExpression.cpp
3004+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLBlock.cpp
3005+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorArray.cpp
3006+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorArray.h
3007+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorCompound.cpp
3008+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorCompound.h
3009+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.cpp
3010+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.h
3011+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.cpp
3012+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.h
3013+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.cpp
3014+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.h
3015+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.cpp
3016+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.h
3017+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorSplat.cpp
3018+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorSplat.h
3019+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorStruct.cpp
3020+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorStruct.h
3021+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLDoStatement.cpp
3022+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLExpressionStatement.cpp
3023+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFieldAccess.cpp
3024+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLForStatement.cpp
3025+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionCall.cpp
3026+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLIfStatement.cpp
3027+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLIndexExpression.cpp
3028+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLPostfixExpression.cpp
3029+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwitchStatement.cpp
3030+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwizzle.cpp
3031+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLTernaryExpression.cpp
3032+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLVarDeclarations.cpp
3033+
----------------------------------------------------------------------------------------------------
3034+
Copyright 2021 Google LLC
3035+
3036+
Redistribution and use in source and binary forms, with or without
3037+
modification, are permitted provided that the following conditions are
3038+
met:
3039+
3040+
* Redistributions of source code must retain the above copyright
3041+
notice, this list of conditions and the following disclaimer.
3042+
3043+
* Redistributions in binary form must reproduce the above copyright
3044+
notice, this list of conditions and the following disclaimer in
3045+
the documentation and/or other materials provided with the
3046+
distribution.
3047+
3048+
* Neither the name of the copyright holder nor the names of its
3049+
contributors may be used to endorse or promote products derived
3050+
from this software without specific prior written permission.
3051+
3052+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
3053+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
3054+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
3055+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
3056+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
3057+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
3058+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
3059+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
3060+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3061+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3062+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3063+
====================================================================================================
3064+
29423065
====================================================================================================
29433066
LIBRARY: skia
29443067
ORIGIN: ../../../third_party/skia/bench/ClearBench.cpp + ../../../third_party/skia/LICENSE
@@ -5148,128 +5271,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
51485271
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
51495272
====================================================================================================
51505273

5151-
====================================================================================================
5152-
LIBRARY: skia
5153-
ORIGIN: ../../../third_party/skia/bench/TriangulatorBench.cpp + ../../../third_party/skia/LICENSE
5154-
TYPE: LicenseType.bsd
5155-
FILE: ../../../third_party/skia/bench/TriangulatorBench.cpp
5156-
FILE: ../../../third_party/skia/experimental/tskit/bindings/bindings.h
5157-
FILE: ../../../third_party/skia/experimental/tskit/bindings/core.cpp
5158-
FILE: ../../../third_party/skia/experimental/tskit/bindings/extension.cpp
5159-
FILE: ../../../third_party/skia/gm/composecolorfilter.cpp
5160-
FILE: ../../../third_party/skia/gm/crbug_1167277.cpp
5161-
FILE: ../../../third_party/skia/gm/crbug_1174186.cpp
5162-
FILE: ../../../third_party/skia/gm/crbug_1174354.cpp
5163-
FILE: ../../../third_party/skia/gm/crbug_1177833.cpp
5164-
FILE: ../../../third_party/skia/gm/lazytiling.cpp
5165-
FILE: ../../../third_party/skia/gm/particles.cpp
5166-
FILE: ../../../third_party/skia/gm/runtimeeffectimage.cpp
5167-
FILE: ../../../third_party/skia/include/core/SkBlender.h
5168-
FILE: ../../../third_party/skia/include/effects/SkBlenders.h
5169-
FILE: ../../../third_party/skia/include/gpu/gl/egl/GrGLMakeEGLInterface.h
5170-
FILE: ../../../third_party/skia/include/gpu/gl/glx/GrGLMakeGLXInterface.h
5171-
FILE: ../../../third_party/skia/include/sksl/DSLSymbols.h
5172-
FILE: ../../../third_party/skia/modules/canvaskit/paragraph_bindings_gen.cpp
5173-
FILE: ../../../third_party/skia/src/core/SkBlendModeBlender.cpp
5174-
FILE: ../../../third_party/skia/src/core/SkBlendModeBlender.h
5175-
FILE: ../../../third_party/skia/src/core/SkBlenderBase.h
5176-
FILE: ../../../third_party/skia/src/core/SkMatrixInvert.cpp
5177-
FILE: ../../../third_party/skia/src/core/SkMatrixInvert.h
5178-
FILE: ../../../third_party/skia/src/core/SkVMBlitter.h
5179-
FILE: ../../../third_party/skia/src/core/SkYUVAInfoLocation.h
5180-
FILE: ../../../third_party/skia/src/effects/SkBlenders.cpp
5181-
FILE: ../../../third_party/skia/src/effects/imagefilters/SkRuntimeImageFilter.cpp
5182-
FILE: ../../../third_party/skia/src/effects/imagefilters/SkRuntimeImageFilter.h
5183-
FILE: ../../../third_party/skia/src/gpu/BaseDevice.cpp
5184-
FILE: ../../../third_party/skia/src/gpu/BaseDevice.h
5185-
FILE: ../../../third_party/skia/src/gpu/GrDstProxyView.h
5186-
FILE: ../../../third_party/skia/src/gpu/GrEagerVertexAllocator.cpp
5187-
FILE: ../../../third_party/skia/src/gpu/GrInnerFanTriangulator.h
5188-
FILE: ../../../third_party/skia/src/gpu/GrMeshDrawTarget.cpp
5189-
FILE: ../../../third_party/skia/src/gpu/GrMeshDrawTarget.h
5190-
FILE: ../../../third_party/skia/src/gpu/GrOpsTypes.h
5191-
FILE: ../../../third_party/skia/src/gpu/GrPersistentCacheUtils.cpp
5192-
FILE: ../../../third_party/skia/src/gpu/GrSubRunAllocator.cpp
5193-
FILE: ../../../third_party/skia/src/gpu/GrSubRunAllocator.h
5194-
FILE: ../../../third_party/skia/src/gpu/GrWritePixelsRenderTask.cpp
5195-
FILE: ../../../third_party/skia/src/gpu/GrWritePixelsRenderTask.h
5196-
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.cpp
5197-
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.h
5198-
FILE: ../../../third_party/skia/src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp
5199-
FILE: ../../../third_party/skia/src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp
5200-
FILE: ../../../third_party/skia/src/gpu/v2/Device.cpp
5201-
FILE: ../../../third_party/skia/src/gpu/v2/Device_v2.h
5202-
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.cpp
5203-
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.h
5204-
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
5205-
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h
5206-
FILE: ../../../third_party/skia/src/sksl/SkSLContext.cpp
5207-
FILE: ../../../third_party/skia/src/sksl/SkSLIntrinsicList.h
5208-
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.h
5209-
FILE: ../../../third_party/skia/src/sksl/SkSLOperators.cpp
5210-
FILE: ../../../third_party/skia/src/sksl/SkSLOperators.h
5211-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLBinaryExpression.cpp
5212-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLBlock.cpp
5213-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorArray.cpp
5214-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorArray.h
5215-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorCompound.cpp
5216-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorCompound.h
5217-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.cpp
5218-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.h
5219-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.cpp
5220-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.h
5221-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.cpp
5222-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.h
5223-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.cpp
5224-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.h
5225-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorSplat.cpp
5226-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorSplat.h
5227-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorStruct.cpp
5228-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorStruct.h
5229-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLDoStatement.cpp
5230-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLExpressionStatement.cpp
5231-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFieldAccess.cpp
5232-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLForStatement.cpp
5233-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionCall.cpp
5234-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLIfStatement.cpp
5235-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLIndexExpression.cpp
5236-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLPostfixExpression.cpp
5237-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwitchStatement.cpp
5238-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwizzle.cpp
5239-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLTernaryExpression.cpp
5240-
FILE: ../../../third_party/skia/src/sksl/ir/SkSLVarDeclarations.cpp
5241-
----------------------------------------------------------------------------------------------------
5242-
Copyright 2021 Google LLC
5243-
5244-
Redistribution and use in source and binary forms, with or without
5245-
modification, are permitted provided that the following conditions are
5246-
met:
5247-
5248-
* Redistributions of source code must retain the above copyright
5249-
notice, this list of conditions and the following disclaimer.
5250-
5251-
* Redistributions in binary form must reproduce the above copyright
5252-
notice, this list of conditions and the following disclaimer in
5253-
the documentation and/or other materials provided with the
5254-
distribution.
5255-
5256-
* Neither the name of the copyright holder nor the names of its
5257-
contributors may be used to endorse or promote products derived
5258-
from this software without specific prior written permission.
5259-
5260-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5261-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5262-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5263-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5264-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5265-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5266-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5267-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5268-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5269-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5270-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5271-
====================================================================================================
5272-
52735274
====================================================================================================
52745275
LIBRARY: skia
52755276
ORIGIN: ../../../third_party/skia/docs/examples/50_percent_gray.cpp + ../../../third_party/skia/LICENSE

0 commit comments

Comments
 (0)