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

Commit 3d711fb

Browse files
Roll Skia from b2a8a7e3e89b to 14aa53bf38da (1 revision) (#33511)
1 parent 8863b48 commit 3d711fb

File tree

2 files changed

+30
-3
lines changed

2 files changed

+30
-3
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': 'b2a8a7e3e89bfc39ae87459723ba8352ffa9933a',
30+
'skia_revision': '14aa53bf38da8712c562e23e33720ac4e166c523',
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: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: c6de07b9c52a1d7051cb2bcad3f9fbf5
1+
Signature: 08768cf7879b842958c8f509593ae305
22

33
UNUSED LICENSES:
44

@@ -168,6 +168,33 @@ reason of your accepting any such warranty or additional liability.
168168

169169
END OF TERMS AND CONDITIONS
170170
====================================================================================================
171+
172+
====================================================================================================
173+
ORIGIN: ../../../third_party/skia/third_party/rive/LICENSE
174+
TYPE: LicenseType.mit
175+
----------------------------------------------------------------------------------------------------
176+
MIT License
177+
178+
Copyright (c) 2020 Rive
179+
180+
Permission is hereby granted, free of charge, to any person obtaining a copy
181+
of this software and associated documentation files (the "Software"), to deal
182+
in the Software without restriction, including without limitation the rights
183+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
184+
copies of the Software, and to permit persons to whom the Software is
185+
furnished to do so, subject to the following conditions:
186+
187+
The above copyright notice and this permission notice shall be included in all
188+
copies or substantial portions of the Software.
189+
190+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
191+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
192+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
193+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
194+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
195+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
196+
SOFTWARE.
197+
====================================================================================================
171198
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
172199
USED LICENSES:
173200

@@ -7947,4 +7974,4 @@ Materials are furnished to do so, subject to the following conditions:
79477974
The above copyright notice and this permission notice shall be included in
79487975
all copies or substantial portions of the Materials.
79497976
====================================================================================================
7950-
Total license count: 67
7977+
Total license count: 68

0 commit comments

Comments
 (0)