Skip to content

Commit e9ca676

Browse files
Roll Skia from 49f89eafefcf to 6c05f9064fe5 (4 revisions) (#34394)
1 parent 2cdcbc7 commit e9ca676

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
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': '49f89eafefcf113df75df2c432bbc79a61a60440',
30+
'skia_revision': '6c05f9064fe5012bf6200bcf2e6160d65160526b',
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 3dde0a2220b1d581e4c5e3b72736eb38
1+
Signature: 914e11dada2367354853ce35b11c7f47
22

33
UNUSED LICENSES:
44

@@ -529,11 +529,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
529529

530530
====================================================================================================
531531
LIBRARY: skcms
532+
LIBRARY: skia
532533
LIBRARY: vulkan
533534
ORIGIN: ../../../third_party/skia/include/third_party/skcms/LICENSE
534535
TYPE: LicenseType.bsd
535536
FILE: ../../../third_party/skia/include/third_party/skcms/BUILD.bazel
536537
FILE: ../../../third_party/skia/include/third_party/vulkan/BUILD.bazel
538+
FILE: ../../../third_party/skia/modules/skcms/BUILD.bazel
539+
FILE: ../../../third_party/skia/modules/skcms/version.sha1
537540
FILE: ../../../third_party/skia/third_party/skcms/BUILD.bazel
538541
FILE: ../../../third_party/skia/third_party/skcms/version.sha1
539542
----------------------------------------------------------------------------------------------------
@@ -568,10 +571,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
568571

569572
====================================================================================================
570573
LIBRARY: skcms
574+
LIBRARY: skia
571575
LIBRARY: vulkanmemoryallocator
572576
ORIGIN: ../../../third_party/skia/include/third_party/skcms/skcms.h + ../../../third_party/skia/include/third_party/skcms/LICENSE
573577
TYPE: LicenseType.bsd
574578
FILE: ../../../third_party/skia/include/third_party/skcms/skcms.h
579+
FILE: ../../../third_party/skia/modules/skcms/skcms.cc
580+
FILE: ../../../third_party/skia/modules/skcms/skcms.h
581+
FILE: ../../../third_party/skia/modules/skcms/skcms_internal.h
582+
FILE: ../../../third_party/skia/modules/skcms/src/Transform_inl.h
575583
FILE: ../../../third_party/skia/third_party/skcms/skcms.cc
576584
FILE: ../../../third_party/skia/third_party/skcms/skcms_internal.h
577585
FILE: ../../../third_party/skia/third_party/skcms/src/Transform_inl.h

sky/packages/sky_engine/LICENSE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13620,6 +13620,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
1362013620
defined by the Mozilla Public License, v. 2.0.
1362113621
--------------------------------------------------------------------------------
1362213622
skcms
13623+
skia
1362313624
vulkan
1362413625

1362513626
Copyright (c) 2018 Google Inc. All rights reserved.
@@ -13651,6 +13652,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1365113652
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1365213653
--------------------------------------------------------------------------------
1365313654
skcms
13655+
skia
1365413656
vulkanmemoryallocator
1365513657

1365613658
Copyright 2018 Google Inc.

0 commit comments

Comments
 (0)