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

Commit 21de22a

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll Skia from acf26501fb5a to a1e30a3a280a (5 revisions) (#24753)
1 parent f5b1351 commit 21de22a

File tree

3 files changed

+70
-34
lines changed

3 files changed

+70
-34
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': 'acf26501fb5a089f1762794b68f35d739fee56e6',
30+
'skia_revision': 'a1e30a3a280ac6a0062a287f7a51a4e5ef1be1fa',
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: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 147b9e31acb4ee75f6468c7f1d53dccd
1+
Signature: 6117abe872698510ee44b47b2d1e81c4
22

33
UNUSED LICENSES:
44

@@ -1223,7 +1223,6 @@ FILE: ../../../third_party/skia/infra/bots/recipes/recreate_skps.expected/failed
12231223
FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json
12241224
FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json
12251225
FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json
1226-
FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_ReduceOpsTaskSplitting_Skpbench.json
12271226
FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json
12281227
FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-AllPathsVolatile_Skpbench.json
12291228
FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json
@@ -5193,6 +5192,7 @@ TYPE: LicenseType.bsd
51935192
FILE: ../../../third_party/skia/bench/TriangulatorBench.cpp
51945193
FILE: ../../../third_party/skia/gm/crbug_1167277.cpp
51955194
FILE: ../../../third_party/skia/gm/crbug_1174186.cpp
5195+
FILE: ../../../third_party/skia/gm/crbug_1174354.cpp
51965196
FILE: ../../../third_party/skia/gm/crbug_1177833.cpp
51975197
FILE: ../../../third_party/skia/gm/lazytiling.cpp
51985198
FILE: ../../../third_party/skia/gm/particles.cpp
@@ -6679,6 +6679,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
66796679
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
66806680
====================================================================================================
66816681

6682+
====================================================================================================
6683+
LIBRARY: skia
6684+
ORIGIN: ../../../third_party/skia/infra/bots/gen_tasks_logic/skpbench_flags.go + ../../../LICENSE
6685+
TYPE: LicenseType.bsd
6686+
FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/skpbench_flags.go
6687+
----------------------------------------------------------------------------------------------------
6688+
Copyright 2021 The Chromium Authors. All rights reserved.
6689+
6690+
Redistribution and use in source and binary forms, with or without
6691+
modification, are permitted provided that the following conditions are
6692+
met:
6693+
6694+
* Redistributions of source code must retain the above copyright
6695+
notice, this list of conditions and the following disclaimer.
6696+
* Redistributions in binary form must reproduce the above
6697+
copyright notice, this list of conditions and the following disclaimer
6698+
in the documentation and/or other materials provided with the
6699+
distribution.
6700+
* Neither the name of Google Inc. nor the names of its
6701+
contributors may be used to endorse or promote products derived from
6702+
this software without specific prior written permission.
6703+
6704+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6705+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6706+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6707+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6708+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6709+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6710+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6711+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6712+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6713+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6714+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6715+
====================================================================================================
6716+
66826717
====================================================================================================
66836718
LIBRARY: skia
66846719
ORIGIN: ../../../third_party/skia/infra/bots/recipe_modules/flavor/resources/win_run_and_check_log.ps1 + ../../../LICENSE
@@ -7434,4 +7469,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
74347469
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
74357470
THE SOFTWARE.
74367471
====================================================================================================
7437-
Total license count: 62
7472+
Total license count: 63

‎sky/packages/sky_engine/LICENSE‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6056,36 +6056,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
60566056
--------------------------------------------------------------------------------
60576057
fuchsia_sdk
60586058

6059-
Copyright 2021 The Chromium Authors. All rights reserved.
6060-
6061-
Redistribution and use in source and binary forms, with or without
6062-
modification, are permitted provided that the following conditions are
6063-
met:
6064-
6065-
* Redistributions of source code must retain the above copyright
6066-
notice, this list of conditions and the following disclaimer.
6067-
* Redistributions in binary form must reproduce the above
6068-
copyright notice, this list of conditions and the following disclaimer
6069-
in the documentation and/or other materials provided with the
6070-
distribution.
6071-
* Neither the name of Google Inc. nor the names of its
6072-
contributors may be used to endorse or promote products derived from
6073-
this software without specific prior written permission.
6074-
6075-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6076-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6077-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6078-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6079-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6080-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6081-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6082-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6083-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6084-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6085-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6086-
--------------------------------------------------------------------------------
6087-
fuchsia_sdk
6088-
60896059
Copyright 2021 The Fuchsia Authors. All rights reserved.
60906060

60916061
Redistribution and use in source and binary forms, with or without
@@ -6451,6 +6421,37 @@ negated the permissions granted in the license. In the spirit of
64516421
permissive licensing, and of not having licensing issues being an
64526422
obstacle to adoption, that text has been removed.
64536423
--------------------------------------------------------------------------------
6424+
fuchsia_sdk
6425+
skia
6426+
6427+
Copyright 2021 The Chromium Authors. All rights reserved.
6428+
6429+
Redistribution and use in source and binary forms, with or without
6430+
modification, are permitted provided that the following conditions are
6431+
met:
6432+
6433+
* Redistributions of source code must retain the above copyright
6434+
notice, this list of conditions and the following disclaimer.
6435+
* Redistributions in binary form must reproduce the above
6436+
copyright notice, this list of conditions and the following disclaimer
6437+
in the documentation and/or other materials provided with the
6438+
distribution.
6439+
* Neither the name of Google Inc. nor the names of its
6440+
contributors may be used to endorse or promote products derived from
6441+
this software without specific prior written permission.
6442+
6443+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6444+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6445+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6446+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6447+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6448+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6449+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6450+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6451+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6452+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6453+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6454+
--------------------------------------------------------------------------------
64546455
glfw
64556456

64566457
Copyright (c) 2002-2006 Marcus Geelnard

0 commit comments

Comments
 (0)