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

Roll Skia from b368746d696a to 3f81f95176ce (11 revisions) #38312

Merged
merged 1 commit into from
Dec 15, 2022
Merged

Roll Skia from b368746d696a to 3f81f95176ce (11 revisions) #38312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ vars = {
'llvm_git': 'https://llvm.googlesource.com',
# OCMock is for testing only so there is no google clone
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
'skia_revision': 'b368746d696a72bff291dddf7ab1492f5d72267f',
'skia_revision': '3f81f95176ce9c2c058c23b974ca6a37edbe80cd',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down
12 changes: 7 additions & 5 deletions ci/licenses_golden/licenses_skia
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 72decec94e29d73f575ce3bd17f2d6f0
Signature: af25ab7e8393e3ffc1c1f2083be9be01

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -8288,13 +8288,11 @@ ORIGIN: ../../../third_party/skia/include/gpu/graphite/dawn/DawnBackendContext.h
ORIGIN: ../../../third_party/skia/include/gpu/vk/VulkanBackendContext.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkAlignedStorage.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkTypeTraits.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkUniquePaintParamsID.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/sksl/SkSLVersion.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/modules/skunicode/src/SkUnicode.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkCapabilities.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkDebugUtils.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkPathUtils.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkRuntimeEffectDictionary.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkSLTypeShared.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkSLTypeShared.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/AtlasTypes.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -8367,6 +8365,8 @@ ORIGIN: ../../../third_party/skia/src/gpu/graphite/Resource.cpp + ../../../third
ORIGIN: ../../../third_party/skia/src/gpu/graphite/Resource.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/ResourceCache.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/ResourceCache.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/RuntimeEffectDictionary.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/RuntimeEffectDictionary.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/Sampler.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/Sampler.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/ShaderCodeDictionary.cpp + ../../../third_party/skia/LICENSE
Expand All @@ -8377,6 +8377,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/graphite/SynchronizeToCpuTask.h + ../.
ORIGIN: ../../../third_party/skia/src/gpu/graphite/TextureProxyView.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/TextureUtils.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/TextureUtils.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/UniquePaintParamsID.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/UploadBufferManager.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/UploadBufferManager.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/UploadTask.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -8495,13 +8496,11 @@ FILE: ../../../third_party/skia/include/gpu/graphite/dawn/DawnBackendContext.h
FILE: ../../../third_party/skia/include/gpu/vk/VulkanBackendContext.h
FILE: ../../../third_party/skia/include/private/SkAlignedStorage.h
FILE: ../../../third_party/skia/include/private/SkTypeTraits.h
FILE: ../../../third_party/skia/include/private/SkUniquePaintParamsID.h
FILE: ../../../third_party/skia/include/sksl/SkSLVersion.h
FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode.cpp
FILE: ../../../third_party/skia/src/core/SkCapabilities.cpp
FILE: ../../../third_party/skia/src/core/SkDebugUtils.h
FILE: ../../../third_party/skia/src/core/SkPathUtils.cpp
FILE: ../../../third_party/skia/src/core/SkRuntimeEffectDictionary.h
FILE: ../../../third_party/skia/src/core/SkSLTypeShared.cpp
FILE: ../../../third_party/skia/src/core/SkSLTypeShared.h
FILE: ../../../third_party/skia/src/gpu/AtlasTypes.cpp
Expand Down Expand Up @@ -8574,6 +8573,8 @@ FILE: ../../../third_party/skia/src/gpu/graphite/Resource.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/Resource.h
FILE: ../../../third_party/skia/src/gpu/graphite/ResourceCache.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/ResourceCache.h
FILE: ../../../third_party/skia/src/gpu/graphite/RuntimeEffectDictionary.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/RuntimeEffectDictionary.h
FILE: ../../../third_party/skia/src/gpu/graphite/Sampler.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/Sampler.h
FILE: ../../../third_party/skia/src/gpu/graphite/ShaderCodeDictionary.cpp
Expand All @@ -8584,6 +8585,7 @@ FILE: ../../../third_party/skia/src/gpu/graphite/SynchronizeToCpuTask.h
FILE: ../../../third_party/skia/src/gpu/graphite/TextureProxyView.h
FILE: ../../../third_party/skia/src/gpu/graphite/TextureUtils.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/TextureUtils.h
FILE: ../../../third_party/skia/src/gpu/graphite/UniquePaintParamsID.h
FILE: ../../../third_party/skia/src/gpu/graphite/UploadBufferManager.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/UploadBufferManager.h
FILE: ../../../third_party/skia/src/gpu/graphite/UploadTask.cpp
Expand Down