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

Roll Skia from b8c0a78a2378 to e1f3980272f3 (24 revisions) #38758

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': 'b8c0a78a2378c621d90733b82f69a7ab356732ee',
'skia_revision': 'e1f3980272f36023aa300c739fee8bef345f2ab3',

# 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
2 changes: 2 additions & 0 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -2608,6 +2608,8 @@
../../../third_party/skia/specs
../../../third_party/skia/src/BUILD.bazel
../../../third_party/skia/src/android/BUILD.bazel
../../../third_party/skia/src/base/BUILD.bazel
../../../third_party/skia/src/base/README.md
../../../third_party/skia/src/codec/BUILD.bazel
../../../third_party/skia/src/core/BUILD.bazel
../../../third_party/skia/src/effects/BUILD.bazel
Expand Down
8 changes: 5 additions & 3 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: fdca516e6e3f00c9c96304eaf4bf26ec
Signature: 1b7e0d1182c107163b421488f3059d82

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -7983,7 +7983,6 @@ LIBRARY: skia
ORIGIN: ../../../third_party/skia/gm/batchedconvexpaths.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/destcolor.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkSLProgramKind.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/base/SkStringView.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/chromium/SkChromeRemoteGlyphCache.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/sksl/DSLBlock.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/sksl/DSLCase.h + ../../../third_party/skia/LICENSE
Expand All @@ -7993,6 +7992,7 @@ ORIGIN: ../../../third_party/skia/include/sksl/DSLStatement.h + ../../../third_p
ORIGIN: ../../../third_party/skia/include/sksl/SkSLDebugTrace.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/sksl/SkSLErrorReporter.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/sksl/SkSLPosition.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/base/SkStringView.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrVertexChunkArray.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrVertexChunkArray.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -8027,7 +8027,6 @@ TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/gm/batchedconvexpaths.cpp
FILE: ../../../third_party/skia/gm/destcolor.cpp
FILE: ../../../third_party/skia/include/private/SkSLProgramKind.h
FILE: ../../../third_party/skia/include/private/base/SkStringView.h
FILE: ../../../third_party/skia/include/private/chromium/SkChromeRemoteGlyphCache.h
FILE: ../../../third_party/skia/include/sksl/DSLBlock.h
FILE: ../../../third_party/skia/include/sksl/DSLCase.h
Expand All @@ -8037,6 +8036,7 @@ FILE: ../../../third_party/skia/include/sksl/DSLStatement.h
FILE: ../../../third_party/skia/include/sksl/SkSLDebugTrace.h
FILE: ../../../third_party/skia/include/sksl/SkSLErrorReporter.h
FILE: ../../../third_party/skia/include/sksl/SkSLPosition.h
FILE: ../../../third_party/skia/src/base/SkStringView.h
FILE: ../../../third_party/skia/src/gpu/ganesh/GrVertexChunkArray.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/GrVertexChunkArray.h
FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.cpp
Expand Down Expand Up @@ -8872,10 +8872,12 @@ LIBRARY: skia
ORIGIN: ../../../third_party/skia/include/private/SkDeque.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkMalloc.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkTo.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkFloatingPoint.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/include/private/SkDeque.h
FILE: ../../../third_party/skia/include/private/SkMalloc.h
FILE: ../../../third_party/skia/include/private/SkTo.h
FILE: ../../../third_party/skia/src/core/SkFloatingPoint.cpp
----------------------------------------------------------------------------------------------------
Copyright 2023 Google LLC

Expand Down