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

Commit 4457dd9

Browse files
skia-flutter-autorollskia-flutter-autoroll
committed
Roll Skia from c098e3c5d932 to e3c0b382b072 (12 revisions)
https://skia.googlesource.com/skia.git/+log/c098e3c5d932..e3c0b382b072 2022-11-23 bungeman@google.com Move expat LICENSE file up to third_party/expat 2022-11-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from bd2c589d0d34 to 46af29f17d19 (1 revision) 2022-11-23 bungeman@google.com Roll Expat from a28238bd to 441f98d0 (351 commits) 2022-11-23 bungeman@google.com Add roll script for expat 2022-11-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll SK Tool from 20e090196af1 to e8d7a0b58143 2022-11-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from 356b2a590e11 to 27727e501aee (13 revisions) 2022-11-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Skia Infra from 8d5d6fd45a13 to 20e090196af1 (2 revisions) 2022-11-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Dawn from edbeeee285d8 to c7e156fb7b8f (27 revisions) 2022-11-23 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 96f4fdc41b84 to bd2c589d0d34 (5 revisions) 2022-11-22 armansito@google.com [sksl] Support all compute stage inputs 2022-11-22 armansito@google.com [sksl] Reduce memory-order constraints of workgroupBarrier() 2022-11-22 brianosman@google.com Simplify the SkColor4fXformer signature If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC jmbetancourt@google.com,kaushikiska@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Skia: https://bugs.chromium.org/p/skia/issues/entry To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
1 parent 8a40e83 commit 4457dd9

File tree

3 files changed

+9
-69
lines changed

3 files changed

+9
-69
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': 'c098e3c5d932798e0381ae452914e2658f20840c',
21+
'skia_revision': 'e3c0b382b0727cfc8a8e7fa0529aee9c4bca3bcd',
2222

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

‎ci/licenses_golden/licenses_skia‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: b50042e33d2c3c1d6c6cf89266e8a205
1+
Signature: ede9289602ed750a87220aeab1ca13ca
22

33
UNUSED LICENSES:
44

@@ -1334,9 +1334,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
13341334
====================================================================================================
13351335

13361336
====================================================================================================
1337+
LIBRARY: expat
13371338
LIBRARY: harfbuzz
1338-
ORIGIN: ../../../third_party/skia/third_party/expat/include/expat_config/LICENSE
1339+
ORIGIN: ../../../third_party/skia/third_party/expat/LICENSE
13391340
TYPE: LicenseType.bsd
1341+
FILE: ../../../third_party/skia/third_party/expat/0001-Do-not-claim-getrandom.patch
1342+
FILE: ../../../third_party/skia/third_party/expat/0002-Do-not-claim-arc4random_buf.patch
1343+
FILE: ../../../third_party/skia/third_party/expat/include/expat_config/expat_config.h
13401344
FILE: ../../../third_party/skia/third_party/harfbuzz/config-override.h
13411345
----------------------------------------------------------------------------------------------------
13421346
Copyright (c) 2021 Google Inc. All rights reserved.
@@ -6974,41 +6978,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
69746978
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
69756979
====================================================================================================
69766980

6977-
====================================================================================================
6978-
LIBRARY: expat
6979-
ORIGIN: ../../../third_party/skia/third_party/expat/include/expat_config/expat_config.h + ../../../third_party/skia/third_party/expat/include/expat_config/LICENSE
6980-
TYPE: LicenseType.bsd
6981-
FILE: ../../../third_party/skia/third_party/expat/include/expat_config/expat_config.h
6982-
----------------------------------------------------------------------------------------------------
6983-
Copyright 2021 Google Inc.
6984-
6985-
Redistribution and use in source and binary forms, with or without
6986-
modification, are permitted provided that the following conditions are
6987-
met:
6988-
6989-
* Redistributions of source code must retain the above copyright
6990-
notice, this list of conditions and the following disclaimer.
6991-
* Redistributions in binary form must reproduce the above
6992-
copyright notice, this list of conditions and the following disclaimer
6993-
in the documentation and/or other materials provided with the
6994-
distribution.
6995-
* Neither the name of Google Inc. nor the names of its
6996-
contributors may be used to endorse or promote products derived from
6997-
this software without specific prior written permission.
6998-
6999-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
7000-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
7001-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
7002-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
7003-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
7004-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
7005-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
7006-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
7007-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
7008-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
7009-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7010-
====================================================================================================
7011-
70126981
====================================================================================================
70136982
LIBRARY: skia
70146983
ORIGIN: ../../../third_party/skia/bench/graphite/IntersectionTreeBench.cpp + ../../../third_party/skia/LICENSE
@@ -8005,4 +7974,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
80057974
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
80067975
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
80077976
====================================================================================================
8008-
Total license count: 68
7977+
Total license count: 67

‎sky/packages/sky_engine/LICENSE‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7180,6 +7180,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
71807180
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
71817181
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
71827182
--------------------------------------------------------------------------------
7183+
expat
71837184
harfbuzz
71847185

71857186
Copyright (c) 2021 Google Inc. All rights reserved.
@@ -11403,36 +11404,6 @@ copyright notice, this list of conditions and the following disclaimer
1140311404
in the documentation and/or other materials provided with the
1140411405
distribution.
1140511406

11406-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
11407-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
11408-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
11409-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
11410-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
11411-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
11412-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
11413-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
11414-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
11415-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
11416-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11417-
--------------------------------------------------------------------------------
11418-
expat
11419-
11420-
Copyright 2021 Google Inc.
11421-
11422-
Redistribution and use in source and binary forms, with or without
11423-
modification, are permitted provided that the following conditions are
11424-
met:
11425-
11426-
* Redistributions of source code must retain the above copyright
11427-
notice, this list of conditions and the following disclaimer.
11428-
* Redistributions in binary form must reproduce the above
11429-
copyright notice, this list of conditions and the following disclaimer
11430-
in the documentation and/or other materials provided with the
11431-
distribution.
11432-
* Neither the name of Google Inc. nor the names of its
11433-
contributors may be used to endorse or promote products derived from
11434-
this software without specific prior written permission.
11435-
1143611407
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1143711408
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1143811409
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

0 commit comments

Comments
 (0)