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

Roll Skia from 7d1636010a55 to 2cf696124c82 (2 revisions) #34696

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 @@ -17,7 +17,7 @@ vars = {
'skia_git': 'https://skia.googlesource.com',
# OCMock is for testing only so there is no google clone
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
'skia_revision': '7d1636010a55664f54165fc6213a37e77609774f',
'skia_revision': '2cf696124c82c42a008d4b530964b2828b48db3a',

# 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
3 changes: 2 additions & 1 deletion ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: d29f5119c11c508cf5ee47ad2a5b6049
Signature: b7adae60dd58eb2389c3b122d29ad1dd

UNUSED LICENSES:

Expand Down Expand Up @@ -6578,6 +6578,7 @@ TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/gm/drawlines_with_local_matrix.cpp
FILE: ../../../third_party/skia/gm/palette.cpp
FILE: ../../../third_party/skia/include/core/SkOpenTypeSVGDecoder.h
FILE: ../../../third_party/skia/modules/skottie/src/BlendModes.cpp
FILE: ../../../third_party/skia/modules/svg/include/SkSVGOpenTypeSVGDecoder.h
FILE: ../../../third_party/skia/modules/svg/src/SkSVGOpenTypeSVGDecoder.cpp
FILE: ../../../third_party/skia/samplecode/SampleSBIX.cpp
Expand Down