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 bd8f8686cc01 to 14ab6ab256fc (2 revisions) (flutter/engine#32833)

Browse Source
This commit is contained in:
skia-flutter-autoroll 2022-04-21 11:04:03 -04:00 committed by GitHub
parent af3ba60b7d
commit a80c6f0e14
3 changed files with 87 additions and 83 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': 'bd8f8686cc014f956f9262e0461899aaa1009a39',
'skia_revision': '14ab6ab256fc63c307d4e391761f88b2e0300dfd',
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

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

@ -1,4 +1,4 @@
Signature: 6e2200f33737c1e90b14e6f6ad59ab1a
Signature: 7f8c62d249d52cf96b02e6fa36c108c7
UNUSED LICENSES:
@ -537,7 +537,9 @@ LIBRARY: vulkan
ORIGIN: ../../../third_party/skia/include/third_party/skcms/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/include/third_party/skcms/BUILD.bazel
FILE: ../../../third_party/skia/include/third_party/vulkan/BUILD.bazel
FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/BUILD.bazel
FILE: ../../../third_party/skia/third_party/skcms/BUILD.bazel
FILE: ../../../third_party/skia/third_party/skcms/version.sha1
----------------------------------------------------------------------------------------------------
Copyright (c) 2018 Google Inc. All rights reserved.
@ -610,6 +612,58 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
====================================================================================================
LIBRARY: skia
LIBRARY: vulkanmemoryallocator
ORIGIN: ../../../third_party/skia/modules/canvaskit/npm_build/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/example.html
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/extra.html
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/multicanvas.html
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/node.example.js
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/package-lock.json
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/package.json
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/shaping.html
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/textapi_utils.js
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/canvaskit-wasm-tests.ts
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/index.d.ts
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/tsconfig.json
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/tslint.json
FILE: ../../../third_party/skia/modules/pathkit/npm-asmjs/example.html
FILE: ../../../third_party/skia/modules/pathkit/npm-asmjs/package.json
FILE: ../../../third_party/skia/modules/pathkit/npm-wasm/example.html
FILE: ../../../third_party/skia/modules/pathkit/npm-wasm/package.json
FILE: ../../../third_party/skia/third_party/vulkanmemoryallocator/BUILD.bazel
----------------------------------------------------------------------------------------------------
Copyright (c) 2011 Google Inc. All rights reserved.
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/icu/scripts/LICENSE
@ -789,7 +843,6 @@ FILE: ../../../third_party/skia/include/private/gpu/ganesh/BUILD.bazel
FILE: ../../../third_party/skia/include/private/gpu/graphite/BUILD.bazel
FILE: ../../../third_party/skia/include/sksl/BUILD.bazel
FILE: ../../../third_party/skia/include/svg/BUILD.bazel
FILE: ../../../third_party/skia/include/third_party/BUILD.bazel
FILE: ../../../third_party/skia/include/utils/BUILD.bazel
FILE: ../../../third_party/skia/include/utils/mac/BUILD.bazel
FILE: ../../../third_party/skia/infra/bots/BUILD.bazel
@ -7459,56 +7512,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/modules/canvaskit/npm_build/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/example.html
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/extra.html
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/multicanvas.html
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/node.example.js
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/package-lock.json
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/package.json
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/shaping.html
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/textapi_utils.js
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/canvaskit-wasm-tests.ts
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/index.d.ts
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/tsconfig.json
FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/tslint.json
FILE: ../../../third_party/skia/modules/pathkit/npm-asmjs/example.html
FILE: ../../../third_party/skia/modules/pathkit/npm-asmjs/package.json
FILE: ../../../third_party/skia/modules/pathkit/npm-wasm/example.html
FILE: ../../../third_party/skia/modules/pathkit/npm-wasm/package.json
----------------------------------------------------------------------------------------------------
Copyright (c) 2011 Google Inc. All rights reserved.
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/samplecode/SampleTextureUpload.cpp + ../../../third_party/skia/LICENSE

61
engine/src/flutter/sky/packages/sky_engine/LICENSE
View File

@ -13684,36 +13684,6 @@ skia
Copyright (c) 2011 Google Inc. All rights reserved.
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.
--------------------------------------------------------------------------------
skia
Copyright (c) 2011 Google Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
@ -15377,6 +15347,37 @@ distribution.
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.
--------------------------------------------------------------------------------
skia
vulkanmemoryallocator
Copyright (c) 2011 Google Inc. All rights reserved.
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