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

Commit a79a3ba

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll Skia from a6364728f638 to 7a14f783bda3 (1 revision) (#30789)
1 parent 748734a commit a79a3ba

File tree

3 files changed

+10
-101
lines changed

3 files changed

+10
-101
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': 'a6364728f6387efa5f18e7ab037de38e06661081',
30+
'skia_revision': '7a14f783bda3d31888795515d2191a1d082bccaf',
3131

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

‎ci/licenses_golden/licenses_skia‎

Lines changed: 9 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 39d59f0c0b2988151c9b97265383ec83
1+
Signature: 2403e00e00b45f6463ef71fff07cd9d1
22

33
UNUSED LICENSES:
44

@@ -169,39 +169,6 @@ reason of your accepting any such warranty or additional liability.
169169
END OF TERMS AND CONDITIONS
170170
====================================================================================================
171171

172-
====================================================================================================
173-
ORIGIN: ../../../third_party/skia/third_party/musl_compat/LICENSE
174-
TYPE: LicenseType.bsd
175-
----------------------------------------------------------------------------------------------------
176-
Copyright (c) 2021 Google LLC All rights reserved.
177-
178-
Redistribution and use in source and binary forms, with or without
179-
modification, are permitted provided that the following conditions are
180-
met:
181-
182-
* Redistributions of source code must retain the above copyright
183-
notice, this list of conditions and the following disclaimer.
184-
* Redistributions in binary form must reproduce the above
185-
copyright notice, this list of conditions and the following disclaimer
186-
in the documentation and/or other materials provided with the
187-
distribution.
188-
* Neither the name of Google Inc. nor the names of its
189-
contributors may be used to endorse or promote products derived from
190-
this software without specific prior written permission.
191-
192-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
193-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
194-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
195-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
196-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
197-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
198-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
199-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
200-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
201-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
202-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
203-
====================================================================================================
204-
205172
====================================================================================================
206173
ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt
207174
TYPE: LicenseType.mit
@@ -518,41 +485,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
518485
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
519486
====================================================================================================
520487

521-
====================================================================================================
522-
LIBRARY: musl_compat
523-
ORIGIN: ../../../third_party/skia/third_party/musl_compat/locale.c + ../../../third_party/skia/third_party/musl_compat/LICENSE
524-
TYPE: LicenseType.bsd
525-
FILE: ../../../third_party/skia/third_party/musl_compat/locale.c
526-
----------------------------------------------------------------------------------------------------
527-
Copyright 2021 Google LLC
528-
529-
Redistribution and use in source and binary forms, with or without
530-
modification, are permitted provided that the following conditions are
531-
met:
532-
533-
* Redistributions of source code must retain the above copyright
534-
notice, this list of conditions and the following disclaimer.
535-
* Redistributions in binary form must reproduce the above
536-
copyright notice, this list of conditions and the following disclaimer
537-
in the documentation and/or other materials provided with the
538-
distribution.
539-
* Neither the name of Google Inc. nor the names of its
540-
contributors may be used to endorse or promote products derived from
541-
this software without specific prior written permission.
542-
543-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
544-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
545-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
546-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
547-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
548-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
549-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
550-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
551-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
552-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
553-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
554-
====================================================================================================
555-
556488
====================================================================================================
557489
LIBRARY: skcms
558490
LIBRARY: vulkan
@@ -739,6 +671,13 @@ FILE: ../../../third_party/skia/experimental/docs/jsonbaseddoc.htm
739671
FILE: ../../../third_party/skia/experimental/docs/svgBackend.js
740672
FILE: ../../../third_party/skia/experimental/docs/svgbaseddoc.htm
741673
FILE: ../../../third_party/skia/experimental/docs/utilities.js
674+
FILE: ../../../third_party/skia/experimental/graphite/include/BUILD.bazel
675+
FILE: ../../../third_party/skia/experimental/graphite/include/mtl/BUILD.bazel
676+
FILE: ../../../third_party/skia/experimental/graphite/include/private/BUILD.bazel
677+
FILE: ../../../third_party/skia/experimental/graphite/src/BUILD.bazel
678+
FILE: ../../../third_party/skia/experimental/graphite/src/geom/BUILD.bazel
679+
FILE: ../../../third_party/skia/experimental/graphite/src/mtl/BUILD.bazel
680+
FILE: ../../../third_party/skia/experimental/graphite/src/render/BUILD.bazel
742681
FILE: ../../../third_party/skia/experimental/skottiekit/cpu.js
743682
FILE: ../../../third_party/skia/experimental/skottiekit/debug.js
744683
FILE: ../../../third_party/skia/experimental/skottiekit/examples/ck.html
@@ -7886,4 +7825,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
78867825
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
78877826
THE SOFTWARE.
78887827
====================================================================================================
7889-
Total license count: 68
7828+
Total license count: 66

‎sky/packages/sky_engine/LICENSE‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12353,36 +12353,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1235312353
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1235412354
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1235512355
--------------------------------------------------------------------------------
12356-
musl_compat
12357-
12358-
Copyright 2021 Google LLC
12359-
12360-
Redistribution and use in source and binary forms, with or without
12361-
modification, are permitted provided that the following conditions are
12362-
met:
12363-
12364-
* Redistributions of source code must retain the above copyright
12365-
notice, this list of conditions and the following disclaimer.
12366-
* Redistributions in binary form must reproduce the above
12367-
copyright notice, this list of conditions and the following disclaimer
12368-
in the documentation and/or other materials provided with the
12369-
distribution.
12370-
* Neither the name of Google Inc. nor the names of its
12371-
contributors may be used to endorse or promote products derived from
12372-
this software without specific prior written permission.
12373-
12374-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
12375-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
12376-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
12377-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
12378-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
12379-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
12380-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
12381-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
12382-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
12383-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
12384-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12385-
--------------------------------------------------------------------------------
1238612356
rapidjson
1238712357

1238812358
Copyright (c) 2006-2013 Alexander Chemeris

0 commit comments

Comments
 (0)