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

Roll Skia from 951123096e55 to 0f974a0f8c10 (5 revisions) #42771

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': '951123096e5545b1e746d1966b814e91aad0649e',
'skia_revision': '0f974a0f8c106f4eccaf474c1d8a468099ea753a',

# 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
1 change: 1 addition & 0 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -2712,6 +2712,7 @@
../../../third_party/skia/modules/jetski/BUILD.bazel
../../../third_party/skia/modules/jetski/README
../../../third_party/skia/modules/pathkit/.gitignore
../../../third_party/skia/modules/pathkit/BUILD.bazel
../../../third_party/skia/modules/pathkit/CHANGELOG.md
../../../third_party/skia/modules/pathkit/Makefile
../../../third_party/skia/modules/pathkit/README.md
Expand Down
6 changes: 3 additions & 3 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 1b5aa1864a71192074c1edbab0b6f6e7
Signature: 91a7383625bcb005f1f83444879b7b0a

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -7492,7 +7492,6 @@ ORIGIN: ../../../third_party/skia/include/gpu/graphite/Recording.h + ../../../th
ORIGIN: ../../../third_party/skia/include/gpu/graphite/TextureInfo.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlBackendContext.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypes.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/chromium/GrSlug.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/chromium/Slug.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrDawnTypesPriv.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrMockTypesPriv.h + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -7714,7 +7713,6 @@ FILE: ../../../third_party/skia/include/gpu/graphite/Recording.h
FILE: ../../../third_party/skia/include/gpu/graphite/TextureInfo.h
FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlBackendContext.h
FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypes.h
FILE: ../../../third_party/skia/include/private/chromium/GrSlug.h
FILE: ../../../third_party/skia/include/private/chromium/Slug.h
FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrDawnTypesPriv.h
FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrMockTypesPriv.h
Expand Down Expand Up @@ -8823,6 +8821,7 @@ ORIGIN: ../../../third_party/skia/src/shaders/SkGainmapShader.cpp + ../../../thi
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLExtension.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLIRHelpers.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLSwitchCase.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/gm/coordclampshader.cpp
FILE: ../../../third_party/skia/gm/fontations.cpp
Expand Down Expand Up @@ -8857,6 +8856,7 @@ FILE: ../../../third_party/skia/src/shaders/SkGainmapShader.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLExtension.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLIRHelpers.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.cpp
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwitchCase.cpp
----------------------------------------------------------------------------------------------------
Copyright 2023 Google Inc.

Expand Down