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

Roll Skia from 8ea9b39f7213 to 69d8378097df (6 revisions) #38953

Merged
merged 1 commit into from
Jan 17, 2023
Merged

Roll Skia from 8ea9b39f7213 to 69d8378097df (6 revisions) #38953

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': '8ea9b39f7213ba38411f39437018a0deffd9bcbb',
'skia_revision': '69d8378097dffceb1a3ea01aea86cec16cea606a',

# 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
8 changes: 3 additions & 5 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: 853869ed01bd550bdf4fa57bf98c31b6
Signature: 9bfcb2b9b29243b0ae4331bef53a5ae7

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -5881,7 +5881,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlSemaphore.mm + ../../.
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/OpsTask.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/OpsTask.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/image/SkSurface_GpuMtl.mm + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/SkSLOutputStream.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/text/StrikeForGPU.h + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -6029,7 +6028,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlSemaphore.mm
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/OpsTask.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/OpsTask.h
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext.cpp
FILE: ../../../third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h
FILE: ../../../third_party/skia/src/image/SkSurface_GpuMtl.mm
FILE: ../../../third_party/skia/src/sksl/SkSLOutputStream.cpp
FILE: ../../../third_party/skia/src/text/StrikeForGPU.h
Expand Down Expand Up @@ -8880,6 +8878,7 @@ ORIGIN: ../../../third_party/skia/src/codec/SkJpegMultiPicture.cpp + ../../../th
ORIGIN: ../../../third_party/skia/src/codec/SkJpegMultiPicture.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/codec/SkJpegSegmentScan.cpp + ../../../third_party/skia/LICENSE
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
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/include/private/SkGainmapInfo.h
Expand All @@ -8889,6 +8888,7 @@ FILE: ../../../third_party/skia/src/codec/SkJpegMultiPicture.cpp
FILE: ../../../third_party/skia/src/codec/SkJpegMultiPicture.h
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
----------------------------------------------------------------------------------------------------
Copyright 2023 Google Inc.
Expand Down Expand Up @@ -8927,13 +8927,11 @@ LIBRARY: skia
ORIGIN: ../../../third_party/skia/include/core/SkMath.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/SkMalloc.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/base/SkCPUTypes.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkDiscardableMemory.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/core/SkMath.h
FILE: ../../../third_party/skia/include/private/SkMalloc.h
FILE: ../../../third_party/skia/include/private/base/SkCPUTypes.h
FILE: ../../../third_party/skia/src/core/SkDiscardableMemory.h
FILE: ../../../third_party/skia/src/core/SkFloatingPoint.cpp
----------------------------------------------------------------------------------------------------
Copyright 2023 Google LLC
Expand Down