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

Roll Skia from c42320d53714 to b46961dcb142 (7 revisions) #40572

Merged
auto-submit merged 1 commit into from
Mar 23, 2023
Merged

Roll Skia from c42320d53714 to b46961dcb142 (7 revisions) #40572

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': 'c42320d537142585fb1fd2aecf6d20a5d7daa8bb',
'skia_revision': 'b46961dcb1424badd3979483497bae6312ba9cdb',

# 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
28 changes: 17 additions & 11 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: dc7579a5781d7d4f1e25e4f28cec92bb
Signature: 418f7a90f26cc7e39b211553652cf98b

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -3134,10 +3134,10 @@ ORIGIN: ../../../third_party/skia/gm/textblobuseaftergpufree.cpp + ../../../thir
ORIGIN: ../../../third_party/skia/gm/transparency.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/codec/SkAndroidCodec.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/codec/SkCodec.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkEncodedImageFormat.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/codec/SkEncodedImageFormat.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/codec/SkPngChunkReader.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkPathBuilder.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkPixmap.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkPngChunkReader.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkPoint3.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkRSXform.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkTraceMemoryDump.h + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -3424,10 +3424,10 @@ FILE: ../../../third_party/skia/gm/textblobuseaftergpufree.cpp
FILE: ../../../third_party/skia/gm/transparency.cpp
FILE: ../../../third_party/skia/include/codec/SkAndroidCodec.h
FILE: ../../../third_party/skia/include/codec/SkCodec.h
FILE: ../../../third_party/skia/include/core/SkEncodedImageFormat.h
FILE: ../../../third_party/skia/include/codec/SkEncodedImageFormat.h
FILE: ../../../third_party/skia/include/codec/SkPngChunkReader.h
FILE: ../../../third_party/skia/include/core/SkPathBuilder.h
FILE: ../../../third_party/skia/include/core/SkPixmap.h
FILE: ../../../third_party/skia/include/core/SkPngChunkReader.h
FILE: ../../../third_party/skia/include/core/SkPoint3.h
FILE: ../../../third_party/skia/include/core/SkRSXform.h
FILE: ../../../third_party/skia/include/core/SkTraceMemoryDump.h
Expand Down Expand Up @@ -3816,12 +3816,12 @@ ORIGIN: ../../../third_party/skia/include/codec/SkCodecAnimation.h + ../../../th
ORIGIN: ../../../third_party/skia/include/core/SkBlendMode.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkClipOp.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkColorSpace.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkICC.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkMilestone.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkOverdrawCanvas.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkRasterHandleAllocator.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkSwizzle.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/effects/SkOverdrawColorFilter.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/encode/SkICC.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/gpu/vk/GrVkBackendContext.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/gpu/vk/GrVkExtensions.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/gpu/vk/GrVkTypes.h + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -3905,8 +3905,6 @@ ORIGIN: ../../../third_party/skia/src/core/SkCpu.cpp + ../../../third_party/skia
ORIGIN: ../../../third_party/skia/src/core/SkCpu.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkFuzzLogging.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkGlobalInitialization_core.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkICC.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkICCPriv.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkImageFilterCache.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkImageFilterCache.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkLRUCache.h + ../../../third_party/skia/LICENSE
Expand All @@ -3928,6 +3926,8 @@ ORIGIN: ../../../third_party/skia/src/core/SkSwizzlePriv.h + ../../../third_part
ORIGIN: ../../../third_party/skia/src/effects/SkOverdrawColorFilter.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/effects/imagefilters/SkArithmeticImageFilter.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/effects/imagefilters/SkShaderImageFilter.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/encode/SkICC.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/encode/SkICCPriv.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/encode/SkImageEncoderPriv.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/Swizzle.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrAppliedClip.h + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -4130,12 +4130,12 @@ FILE: ../../../third_party/skia/include/codec/SkCodecAnimation.h
FILE: ../../../third_party/skia/include/core/SkBlendMode.h
FILE: ../../../third_party/skia/include/core/SkClipOp.h
FILE: ../../../third_party/skia/include/core/SkColorSpace.h
FILE: ../../../third_party/skia/include/core/SkICC.h
FILE: ../../../third_party/skia/include/core/SkMilestone.h
FILE: ../../../third_party/skia/include/core/SkOverdrawCanvas.h
FILE: ../../../third_party/skia/include/core/SkRasterHandleAllocator.h
FILE: ../../../third_party/skia/include/core/SkSwizzle.h
FILE: ../../../third_party/skia/include/effects/SkOverdrawColorFilter.h
FILE: ../../../third_party/skia/include/encode/SkICC.h
FILE: ../../../third_party/skia/include/gpu/vk/GrVkBackendContext.h
FILE: ../../../third_party/skia/include/gpu/vk/GrVkExtensions.h
FILE: ../../../third_party/skia/include/gpu/vk/GrVkTypes.h
Expand Down Expand Up @@ -4219,8 +4219,6 @@ FILE: ../../../third_party/skia/src/core/SkCpu.cpp
FILE: ../../../third_party/skia/src/core/SkCpu.h
FILE: ../../../third_party/skia/src/core/SkFuzzLogging.h
FILE: ../../../third_party/skia/src/core/SkGlobalInitialization_core.cpp
FILE: ../../../third_party/skia/src/core/SkICC.cpp
FILE: ../../../third_party/skia/src/core/SkICCPriv.h
FILE: ../../../third_party/skia/src/core/SkImageFilterCache.cpp
FILE: ../../../third_party/skia/src/core/SkImageFilterCache.h
FILE: ../../../third_party/skia/src/core/SkLRUCache.h
Expand All @@ -4242,6 +4240,8 @@ FILE: ../../../third_party/skia/src/core/SkSwizzlePriv.h
FILE: ../../../third_party/skia/src/effects/SkOverdrawColorFilter.cpp
FILE: ../../../third_party/skia/src/effects/imagefilters/SkArithmeticImageFilter.cpp
FILE: ../../../third_party/skia/src/effects/imagefilters/SkShaderImageFilter.cpp
FILE: ../../../third_party/skia/src/encode/SkICC.cpp
FILE: ../../../third_party/skia/src/encode/SkICCPriv.h
FILE: ../../../third_party/skia/src/encode/SkImageEncoderPriv.h
FILE: ../../../third_party/skia/src/gpu/Swizzle.h
FILE: ../../../third_party/skia/src/gpu/ganesh/GrAppliedClip.h
Expand Down Expand Up @@ -8962,6 +8962,8 @@ ORIGIN: ../../../third_party/skia/fuzz/FuzzCubicQuadRoots.cpp + ../../../third_p
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicQuadRoots.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/graphite_replay.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/android/SkImageAndroid.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkEncodedImageFormat.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkICC.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/core/SkTextureCompressionType.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/gpu/graphite/YUVABackendTextures.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/base/SkCPUTypes.h + ../../../third_party/skia/LICENSE
Expand All @@ -8971,6 +8973,7 @@ ORIGIN: ../../../third_party/skia/src/base/SkCubics.h + ../../../third_party/ski
ORIGIN: ../../../third_party/skia/src/base/SkFloatingPoint.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/base/SkQuads.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/base/SkQuads.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/base/SkRectMemcpy.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/base/SkSafeMath.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkBlitter_A8.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkCanvas_Raster.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -9018,6 +9021,8 @@ FILE: ../../../third_party/skia/fuzz/FuzzCubicQuadRoots.cpp
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicQuadRoots.cpp
FILE: ../../../third_party/skia/gm/graphite_replay.cpp
FILE: ../../../third_party/skia/include/android/SkImageAndroid.h
FILE: ../../../third_party/skia/include/core/SkEncodedImageFormat.h
FILE: ../../../third_party/skia/include/core/SkICC.h
FILE: ../../../third_party/skia/include/core/SkTextureCompressionType.h
FILE: ../../../third_party/skia/include/gpu/graphite/YUVABackendTextures.h
FILE: ../../../third_party/skia/include/private/base/SkCPUTypes.h
Expand All @@ -9027,6 +9032,7 @@ FILE: ../../../third_party/skia/src/base/SkCubics.h
FILE: ../../../third_party/skia/src/base/SkFloatingPoint.cpp
FILE: ../../../third_party/skia/src/base/SkQuads.cpp
FILE: ../../../third_party/skia/src/base/SkQuads.h
FILE: ../../../third_party/skia/src/base/SkRectMemcpy.h
FILE: ../../../third_party/skia/src/base/SkSafeMath.cpp
FILE: ../../../third_party/skia/src/core/SkBlitter_A8.h
FILE: ../../../third_party/skia/src/core/SkCanvas_Raster.cpp
Expand Down