firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll Skia from 904d26fab474 to 80428f7c2e96 (7 revisions) (flutter/engine#31210)

Browse Source
This commit is contained in:
skia-flutter-autoroll
2022-02-02 12:10:10 -05:00
committed by GitHub
parent fd09dc3626
commit b0947ab714
3 changed files with 55 additions and 51 deletions
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': '904d26fab47406742570f93568af5cdde225090e',
'skia_revision': '80428f7c2e96bca869c5edfb50b0a83d9addcd7a',
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

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

@@ -1,4 +1,4 @@
Signature: 25e0833c61320f0c175648053db6bf73
Signature: 6febc01cb201523a8753ddd2b322c43d
UNUSED LICENSES:
@@ -485,6 +485,46 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
====================================================================================================
LIBRARY: libjxl
LIBRARY: skia
ORIGIN: ../../../third_party/skia/experimental/tskit/go/gen_types/gen_types.go + ../../../LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/experimental/tskit/go/gen_types/gen_types.go
FILE: ../../../third_party/skia/experimental/tskit/go/gen_types/gen_types_test.go
FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/skpbench_flags.go
FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_skottie_frames/make_lotties_with_assets/make_lotties_with_assets.go
FILE: ../../../third_party/skia/third_party/libjxl/jxl/jxl_export.h
----------------------------------------------------------------------------------------------------
Copyright 2021 The Chromium Authors. 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: skcms
LIBRARY: vulkan
@@ -5563,6 +5603,8 @@ FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeImage.cpp
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/codec/SkJpegxlCodec.cpp
FILE: ../../../third_party/skia/src/codec/SkJpegxlCodec.h
FILE: ../../../third_party/skia/src/gpu/GrDrawIndirectCommand.h
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.cpp
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.h
@@ -6111,7 +6153,6 @@ FILE: ../../../third_party/skia/gm/destcolor.cpp
FILE: ../../../third_party/skia/gm/dsl_processor_test.cpp
FILE: ../../../third_party/skia/include/private/SkSLProgramKind.h
FILE: ../../../third_party/skia/include/private/SkStringView.h
FILE: ../../../third_party/skia/include/private/SkTOptional.h
FILE: ../../../third_party/skia/include/private/chromium/SkChromeRemoteGlyphCache.h
FILE: ../../../third_party/skia/include/sksl/DSLBlock.h
FILE: ../../../third_party/skia/include/sksl/DSLCase.h
@@ -6197,44 +6238,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/experimental/tskit/go/gen_types/gen_types.go + ../../../LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/experimental/tskit/go/gen_types/gen_types.go
FILE: ../../../third_party/skia/experimental/tskit/go/gen_types/gen_types_test.go
FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/skpbench_flags.go
FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_skottie_frames/make_lotties_with_assets/make_lotties_with_assets.go
----------------------------------------------------------------------------------------------------
Copyright 2021 The Chromium Authors. 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/fuzz/FuzzDrawFunctions.cpp + ../../../third_party/skia/LICENSE

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

@@ -1644,16 +1644,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
angle
fuchsia_sdk
rapidjson
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--------------------------------------------------------------------------------
angle
fuchsia_sdk
libjxl
skia
Copyright 2021 The Chromium Authors. All rights reserved.
@@ -1685,6 +1676,16 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
angle
fuchsia_sdk
rapidjson
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--------------------------------------------------------------------------------
angle
khronos
Copyright (c) 2013-2014 The Khronos Group Inc.