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

Commit 347a4f3

Browse files
Roll Skia from 49e7eadb1edf to bc2449a2f7fc (11 revisions) (#40155)
Roll Skia from 49e7eadb1edf to bc2449a2f7fc (11 revisions)
1 parent 45c642a commit 347a4f3

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
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': '49e7eadb1edf9abd76b9869e1083a7594db3f74f',
21+
'skia_revision': 'bc2449a2f7fc30fa729d72a8f6bfe0c4855c5efc',
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: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: f6c72ee817ea430a1faefd65b5a18cbf
1+
Signature: 311b1c653b99a5233e074db41ca92d84
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -7307,7 +7307,7 @@ ORIGIN: ../../../third_party/skia/gm/largeclippedpath.cpp + ../../../third_party
73077307
ORIGIN: ../../../third_party/skia/gm/skbug_12212.cpp + ../../../third_party/skia/LICENSE
73087308
ORIGIN: ../../../third_party/skia/gm/slug.cpp + ../../../third_party/skia/LICENSE
73097309
ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrMtlTypesPriv.h + ../../../third_party/skia/LICENSE
7310-
ORIGIN: ../../../third_party/skia/include/private/gpu/graphite/MtlTypesPriv.h + ../../../third_party/skia/LICENSE
7310+
ORIGIN: ../../../third_party/skia/include/private/gpu/graphite/MtlGraphiteTypesPriv.h + ../../../third_party/skia/LICENSE
73117311
ORIGIN: ../../../third_party/skia/include/utils/SkOrderedFontMgr.h + ../../../third_party/skia/LICENSE
73127312
ORIGIN: ../../../third_party/skia/modules/jetski/src/Canvas.cpp + ../../../third_party/skia/LICENSE
73137313
ORIGIN: ../../../third_party/skia/modules/jetski/src/ColorFilters.cpp + ../../../third_party/skia/LICENSE
@@ -7372,8 +7372,9 @@ ORIGIN: ../../../third_party/skia/src/gpu/graphite/BufferManager.h + ../../../th
73727372
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBlitCommandEncoder.h + ../../../third_party/skia/LICENSE
73737373
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBuffer.h + ../../../third_party/skia/LICENSE
73747374
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBuffer.mm + ../../../third_party/skia/LICENSE
7375+
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlGraphiteUtils.mm + ../../../third_party/skia/LICENSE
73757376
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlRenderCommandEncoder.h + ../../../third_party/skia/LICENSE
7376-
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlUtils.mm + ../../../third_party/skia/LICENSE
7377+
ORIGIN: ../../../third_party/skia/src/gpu/mtl/MtlUtils.mm + ../../../third_party/skia/LICENSE
73777378
ORIGIN: ../../../third_party/skia/src/gpu/tessellate/CullTest.h + ../../../third_party/skia/LICENSE
73787379
ORIGIN: ../../../third_party/skia/src/gpu/tessellate/Tessellation.h + ../../../third_party/skia/LICENSE
73797380
ORIGIN: ../../../third_party/skia/src/shaders/SkTransformShader.cpp + ../../../third_party/skia/LICENSE
@@ -7393,7 +7394,7 @@ FILE: ../../../third_party/skia/gm/largeclippedpath.cpp
73937394
FILE: ../../../third_party/skia/gm/skbug_12212.cpp
73947395
FILE: ../../../third_party/skia/gm/slug.cpp
73957396
FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrMtlTypesPriv.h
7396-
FILE: ../../../third_party/skia/include/private/gpu/graphite/MtlTypesPriv.h
7397+
FILE: ../../../third_party/skia/include/private/gpu/graphite/MtlGraphiteTypesPriv.h
73977398
FILE: ../../../third_party/skia/include/utils/SkOrderedFontMgr.h
73987399
FILE: ../../../third_party/skia/modules/jetski/src/Canvas.cpp
73997400
FILE: ../../../third_party/skia/modules/jetski/src/ColorFilters.cpp
@@ -7458,8 +7459,9 @@ FILE: ../../../third_party/skia/src/gpu/graphite/BufferManager.h
74587459
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBlitCommandEncoder.h
74597460
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBuffer.h
74607461
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBuffer.mm
7462+
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlGraphiteUtils.mm
74617463
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlRenderCommandEncoder.h
7462-
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlUtils.mm
7464+
FILE: ../../../third_party/skia/src/gpu/mtl/MtlUtils.mm
74637465
FILE: ../../../third_party/skia/src/gpu/tessellate/CullTest.h
74647466
FILE: ../../../third_party/skia/src/gpu/tessellate/Tessellation.h
74657467
FILE: ../../../third_party/skia/src/shaders/SkTransformShader.cpp
@@ -7530,7 +7532,7 @@ ORIGIN: ../../../third_party/skia/include/gpu/graphite/Recorder.h + ../../../thi
75307532
ORIGIN: ../../../third_party/skia/include/gpu/graphite/Recording.h + ../../../third_party/skia/LICENSE
75317533
ORIGIN: ../../../third_party/skia/include/gpu/graphite/TextureInfo.h + ../../../third_party/skia/LICENSE
75327534
ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlBackendContext.h + ../../../third_party/skia/LICENSE
7533-
ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlTypes.h + ../../../third_party/skia/LICENSE
7535+
ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypes.h + ../../../third_party/skia/LICENSE
75347536
ORIGIN: ../../../third_party/skia/include/private/chromium/GrSlug.h + ../../../third_party/skia/LICENSE
75357537
ORIGIN: ../../../third_party/skia/include/private/chromium/Slug.h + ../../../third_party/skia/LICENSE
75367538
ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrDawnTypesPriv.h + ../../../third_party/skia/LICENSE
@@ -7649,16 +7651,17 @@ ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlCommandBuffer.h + ../.
76497651
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlCommandBuffer.mm + ../../../third_party/skia/LICENSE
76507652
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlGraphicsPipeline.h + ../../../third_party/skia/LICENSE
76517653
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlGraphicsPipeline.mm + ../../../third_party/skia/LICENSE
7654+
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlGraphiteTypes.mm + ../../../third_party/skia/LICENSE
7655+
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlGraphiteUtilsPriv.h + ../../../third_party/skia/LICENSE
76527656
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlResourceProvider.h + ../../../third_party/skia/LICENSE
76537657
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlResourceProvider.mm + ../../../third_party/skia/LICENSE
76547658
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlSharedContext.h + ../../../third_party/skia/LICENSE
76557659
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlSharedContext.mm + ../../../third_party/skia/LICENSE
76567660
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTexture.h + ../../../third_party/skia/LICENSE
76577661
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTexture.mm + ../../../third_party/skia/LICENSE
7658-
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTypesPriv.mm + ../../../third_party/skia/LICENSE
7659-
ORIGIN: ../../../third_party/skia/src/gpu/graphite/mtl/MtlUtilsPriv.h + ../../../third_party/skia/LICENSE
76607662
ORIGIN: ../../../third_party/skia/src/gpu/mtl/MtlMemoryAllocatorImpl.h + ../../../third_party/skia/LICENSE
76617663
ORIGIN: ../../../third_party/skia/src/gpu/mtl/MtlMemoryAllocatorImpl.mm + ../../../third_party/skia/LICENSE
7664+
ORIGIN: ../../../third_party/skia/src/gpu/mtl/MtlUtilsPriv.h + ../../../third_party/skia/LICENSE
76627665
ORIGIN: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp + ../../../third_party/skia/LICENSE
76637666
ORIGIN: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h + ../../../third_party/skia/LICENSE
76647667
ORIGIN: ../../../third_party/skia/src/sksl/SkSLContext.cpp + ../../../third_party/skia/LICENSE
@@ -7754,7 +7757,7 @@ FILE: ../../../third_party/skia/include/gpu/graphite/Recorder.h
77547757
FILE: ../../../third_party/skia/include/gpu/graphite/Recording.h
77557758
FILE: ../../../third_party/skia/include/gpu/graphite/TextureInfo.h
77567759
FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlBackendContext.h
7757-
FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlTypes.h
7760+
FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypes.h
77587761
FILE: ../../../third_party/skia/include/private/chromium/GrSlug.h
77597762
FILE: ../../../third_party/skia/include/private/chromium/Slug.h
77607763
FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrDawnTypesPriv.h
@@ -7873,16 +7876,17 @@ FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlCommandBuffer.h
78737876
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlCommandBuffer.mm
78747877
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlGraphicsPipeline.h
78757878
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlGraphicsPipeline.mm
7879+
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlGraphiteTypes.mm
7880+
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlGraphiteUtilsPriv.h
78767881
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlResourceProvider.h
78777882
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlResourceProvider.mm
78787883
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlSharedContext.h
78797884
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlSharedContext.mm
78807885
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTexture.h
78817886
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTexture.mm
7882-
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTypesPriv.mm
7883-
FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlUtilsPriv.h
78847887
FILE: ../../../third_party/skia/src/gpu/mtl/MtlMemoryAllocatorImpl.h
78857888
FILE: ../../../third_party/skia/src/gpu/mtl/MtlMemoryAllocatorImpl.mm
7889+
FILE: ../../../third_party/skia/src/gpu/mtl/MtlUtilsPriv.h
78867890
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
78877891
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h
78887892
FILE: ../../../third_party/skia/src/sksl/SkSLContext.cpp
@@ -8289,7 +8293,7 @@ ORIGIN: ../../../third_party/skia/include/gpu/graphite/ContextOptions.h + ../../
82898293
ORIGIN: ../../../third_party/skia/include/gpu/graphite/ImageProvider.h + ../../../third_party/skia/LICENSE
82908294
ORIGIN: ../../../third_party/skia/include/gpu/graphite/dawn/DawnBackendContext.h + ../../../third_party/skia/LICENSE
82918295
ORIGIN: ../../../third_party/skia/include/gpu/graphite/dawn/DawnUtils.h + ../../../third_party/skia/LICENSE
8292-
ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlUtils.h + ../../../third_party/skia/LICENSE
8296+
ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlGraphiteUtils.h + ../../../third_party/skia/LICENSE
82938297
ORIGIN: ../../../third_party/skia/include/gpu/graphite/vk/VulkanGraphiteUtils.h + ../../../third_party/skia/LICENSE
82948298
ORIGIN: ../../../third_party/skia/include/gpu/vk/VulkanBackendContext.h + ../../../third_party/skia/LICENSE
82958299
ORIGIN: ../../../third_party/skia/include/private/base/SkAPI.h + ../../../third_party/skia/LICENSE
@@ -8514,7 +8518,7 @@ FILE: ../../../third_party/skia/include/gpu/graphite/ContextOptions.h
85148518
FILE: ../../../third_party/skia/include/gpu/graphite/ImageProvider.h
85158519
FILE: ../../../third_party/skia/include/gpu/graphite/dawn/DawnBackendContext.h
85168520
FILE: ../../../third_party/skia/include/gpu/graphite/dawn/DawnUtils.h
8517-
FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlUtils.h
8521+
FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlGraphiteUtils.h
85188522
FILE: ../../../third_party/skia/include/gpu/graphite/vk/VulkanGraphiteUtils.h
85198523
FILE: ../../../third_party/skia/include/gpu/vk/VulkanBackendContext.h
85208524
FILE: ../../../third_party/skia/include/private/base/SkAPI.h

0 commit comments

Comments
 (0)