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

Roll Skia from da5034f9d117 to c4b171fe5668 (1 revision) #39127

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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': 'da5034f9d117ac2bc6ee62af6530e114c874d443',
'skia_revision': 'c4b171fe5668a522c222b0777afefcb3cbd8a2ac',

# 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
6 changes: 5 additions & 1 deletion ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: a2feff42de81f74889917e89725a8bd8
Signature: fdba0e7b767e0dd32daaf68cc6161442

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -8878,6 +8878,7 @@ LIBRARY: skia
ORIGIN: ../../../third_party/skia/gm/imagefiltersunpremul.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkGainmapInfo.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkGainmapShader.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkJpegGainmapEncoder.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/codec/SkJpegGainmap.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/codec/SkJpegGainmap.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/codec/SkJpegMultiPicture.cpp + ../../../third_party/skia/LICENSE
Expand All @@ -8886,11 +8887,13 @@ ORIGIN: ../../../third_party/skia/src/codec/SkJpegSegmentScan.cpp + ../../../thi
ORIGIN: ../../../third_party/skia/src/codec/SkJpegSegmentScan.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpContexts.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/images/SkJpegGainmapEncoder.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/shaders/SkGainmapShader.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/gm/imagefiltersunpremul.cpp
FILE: ../../../third_party/skia/include/private/SkGainmapInfo.h
FILE: ../../../third_party/skia/include/private/SkGainmapShader.h
FILE: ../../../third_party/skia/include/private/SkJpegGainmapEncoder.h
FILE: ../../../third_party/skia/src/codec/SkJpegGainmap.cpp
FILE: ../../../third_party/skia/src/codec/SkJpegGainmap.h
FILE: ../../../third_party/skia/src/codec/SkJpegMultiPicture.cpp
Expand All @@ -8899,6 +8902,7 @@ FILE: ../../../third_party/skia/src/codec/SkJpegSegmentScan.cpp
FILE: ../../../third_party/skia/src/codec/SkJpegSegmentScan.h
FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpContexts.h
FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h
FILE: ../../../third_party/skia/src/images/SkJpegGainmapEncoder.cpp
FILE: ../../../third_party/skia/src/shaders/SkGainmapShader.cpp
----------------------------------------------------------------------------------------------------
Copyright 2023 Google Inc.
Expand Down