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

Roll Skia from d7ddbe668dc4 to 4cf577899cd7 (19 revisions) #33161

Merged
merged 1 commit into from
May 6, 2022
Merged

Roll Skia from d7ddbe668dc4 to 4cf577899cd7 (19 revisions) #33161

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 @@ -27,7 +27,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': 'd7ddbe668dc4ae7f25eebebea058e759e7024609',
'skia_revision': '4cf577899cd7edf930dea9887f54b34730772aaf',

# 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
36 changes: 18 additions & 18 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: 4010fa3decd081ab8c5342138801ad1e
Signature: 1b37f5892914bfb90ee12c9496adbd5b

UNUSED LICENSES:

Expand Down Expand Up @@ -1284,7 +1284,7 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/gradients/BUILD.bazel
FILE: ../../../third_party/skia/src/gpu/ganesh/mock/BUILD.bazel
FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/BUILD.bazel
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/BUILD.bazel
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/shaders/BUILD.bazel
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/BUILD.bazel
FILE: ../../../third_party/skia/src/gpu/ganesh/text/BUILD.bazel
FILE: ../../../third_party/skia/src/gpu/ganesh/v1/BUILD.bazel
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/BUILD.bazel
Expand Down Expand Up @@ -2808,8 +2808,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/GrMeshDrawTarget.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/GrMeshDrawTarget.h
FILE: ../../../third_party/skia/src/gpu/ganesh/GrOpsTypes.h
FILE: ../../../third_party/skia/src/gpu/ganesh/GrPersistentCacheUtils.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/GrSubRunAllocator.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/GrSubRunAllocator.h
FILE: ../../../third_party/skia/src/gpu/ganesh/GrSurfaceInfo.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/GrWritePixelsRenderTask.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/GrWritePixelsRenderTask.h
Expand Down Expand Up @@ -2973,6 +2971,8 @@ FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateDeadGlobalVariab
FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateDeadLocalVariables.cpp
FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateUnreachableCode.cpp
FILE: ../../../third_party/skia/src/sksl/transform/SkSLProgramWriter.h
FILE: ../../../third_party/skia/src/text/gpu/SubRunAllocator.cpp
FILE: ../../../third_party/skia/src/text/gpu/SubRunAllocator.h
FILE: ../../../third_party/skia/src/utils/SkVMVisualizer.cpp
FILE: ../../../third_party/skia/src/utils/SkVMVisualizer.h
----------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -3271,8 +3271,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/TriangulatingPathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ganesh/text/GrDistanceFieldAdjustTable.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/text/GrDistanceFieldAdjustTable.h
FILE: ../../../third_party/skia/src/gpu/ganesh/text/GrStrikeCache.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/text/GrStrikeCache.h
FILE: ../../../third_party/skia/src/gpu/ganesh/text/GrTextBlob.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/text/GrTextBlob.h
FILE: ../../../third_party/skia/src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.cpp
Expand Down Expand Up @@ -3339,6 +3337,8 @@ FILE: ../../../third_party/skia/src/shaders/SkImageShader.h
FILE: ../../../third_party/skia/src/svg/SkSVGCanvas.cpp
FILE: ../../../third_party/skia/src/svg/SkSVGDevice.cpp
FILE: ../../../third_party/skia/src/svg/SkSVGDevice.h
FILE: ../../../third_party/skia/src/text/gpu/StrikeCache.cpp
FILE: ../../../third_party/skia/src/text/gpu/StrikeCache.h
FILE: ../../../third_party/skia/src/utils/SkPaintFilterCanvas.cpp
FILE: ../../../third_party/skia/src/xps/SkXPSDocument.cpp
----------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -5737,8 +5737,8 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathInnerTriangulateOp.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathInnerTriangulateOp.h
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/TessellationPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/TessellationPathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.h
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrPathTessellationShader.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrPathTessellationShader.h
FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicStackState.cpp
FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicStackState.h
FILE: ../../../third_party/skia/src/pdf/SkPDFType1Font.cpp
Expand Down Expand Up @@ -6084,9 +6084,9 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/GrVx.h
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasInstancedHelper.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/StrokeTessellateOp.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/StrokeTessellateOp.h
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.h
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader.h
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrTessellationShader.h
FILE: ../../../third_party/skia/src/opts/SkVM_opts.h
FILE: ../../../third_party/skia/src/sksl/SkSLAnalysis.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLModifiersPool.h
Expand Down Expand Up @@ -6156,12 +6156,10 @@ FILE: ../../../third_party/skia/src/gpu/AtlasTypes.cpp
FILE: ../../../third_party/skia/src/gpu/AtlasTypes.h
FILE: ../../../third_party/skia/src/gpu/RefCntedCallback.h
FILE: ../../../third_party/skia/src/gpu/ganesh/GrImageInfo.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathTessellator.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathTessellator.h
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/StrokeTessellator.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/StrokeTessellator.h
FILE: ../../../third_party/skia/src/gpu/ganesh/text/GrGlyphVector.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/text/GrGlyphVector.h
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/PathTessellator.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/PathTessellator.h
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/StrokeTessellator.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/StrokeTessellator.h
FILE: ../../../third_party/skia/src/gpu/graphite/ClipStack.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/ClipStack_graphite.h
FILE: ../../../third_party/skia/src/gpu/graphite/DrawGeometry.h
Expand Down Expand Up @@ -6204,6 +6202,8 @@ FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.h
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsSameExpressionTree.cpp
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLNoOpErrorReporter.h
FILE: ../../../third_party/skia/src/text/gpu/GlyphVector.cpp
FILE: ../../../third_party/skia/src/text/gpu/GlyphVector.h
FILE: ../../../third_party/skia/src/utils/SkTestCanvas.h
----------------------------------------------------------------------------------------------------
Copyright 2022 Google LLC
Expand Down Expand Up @@ -6466,7 +6466,7 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathStencilCoverOp.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathStencilCoverOp.h
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathTessellateOp.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathTessellateOp.h
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/shaders/GrTessellationShader.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrTessellationShader.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/AffineMatrix.h
FILE: ../../../third_party/skia/src/gpu/tessellate/PatchWriter.h
FILE: ../../../third_party/skia/src/gpu/tessellate/Tessellation.cpp
Expand Down