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

Roll Skia from 957ed75731e0 to 7020699e3835 (7 revisions) #28145

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 @@ -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': '957ed75731e015482bbd71ad512867aa8bdfbcd5',
'skia_revision': '7020699e383560c1e4e30aa6a6c2b94dfbf94544',

# 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
16 changes: 8 additions & 8 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: eb3e8def48e6b8f1d95cb63bbcf2f973
Signature: e767373f4cf99e856550532d4f7e1452

UNUSED LICENSES:

Expand Down Expand Up @@ -2468,14 +2468,16 @@ FILE: ../../../third_party/skia/src/gpu/GrSimpleMesh.h
FILE: ../../../third_party/skia/src/gpu/GrTTopoSort.h
FILE: ../../../third_party/skia/src/gpu/GrTestUtils.cpp
FILE: ../../../third_party/skia/src/gpu/GrTestUtils.h
FILE: ../../../third_party/skia/src/gpu/GrTriangulator.cpp
FILE: ../../../third_party/skia/src/gpu/GrTriangulator.h
FILE: ../../../third_party/skia/src/gpu/GrXferProcessor.cpp
FILE: ../../../third_party/skia/src/gpu/effects/GrBlendFragmentProcessor.cpp
FILE: ../../../third_party/skia/src/gpu/effects/GrBlendFragmentProcessor.h
FILE: ../../../third_party/skia/src/gpu/effects/GrCustomXfermode.cpp
FILE: ../../../third_party/skia/src/gpu/effects/GrCustomXfermode.h
FILE: ../../../third_party/skia/src/gpu/geometry/GrAAConvexTessellator.cpp
FILE: ../../../third_party/skia/src/gpu/geometry/GrAAConvexTessellator.h
FILE: ../../../third_party/skia/src/gpu/geometry/GrQuad.h
FILE: ../../../third_party/skia/src/gpu/geometry/GrTriangulator.cpp
FILE: ../../../third_party/skia/src/gpu/geometry/GrTriangulator.h
FILE: ../../../third_party/skia/src/gpu/gl/GrGLTextureRenderTarget.cpp
FILE: ../../../third_party/skia/src/gpu/gl/GrGLUniformHandler.cpp
FILE: ../../../third_party/skia/src/gpu/gl/GrGLUniformHandler.h
Expand All @@ -2488,8 +2490,6 @@ FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLProgramDataManager.h
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLUniformHandler.h
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLVarying.cpp
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLVarying.h
FILE: ../../../third_party/skia/src/gpu/ops/GrAAConvexTessellator.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrAAConvexTessellator.h
FILE: ../../../third_party/skia/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrAALinearizingConvexPathRenderer.h
FILE: ../../../third_party/skia/src/gpu/ops/GrAtlasTextOp.cpp
Expand Down Expand Up @@ -2974,7 +2974,6 @@ FILE: ../../../third_party/skia/src/gpu/BaseDevice.cpp
FILE: ../../../third_party/skia/src/gpu/BaseDevice.h
FILE: ../../../third_party/skia/src/gpu/GrDstProxyView.h
FILE: ../../../third_party/skia/src/gpu/GrEagerVertexAllocator.cpp
FILE: ../../../third_party/skia/src/gpu/GrInnerFanTriangulator.h
FILE: ../../../third_party/skia/src/gpu/GrMeshDrawTarget.cpp
FILE: ../../../third_party/skia/src/gpu/GrMeshDrawTarget.h
FILE: ../../../third_party/skia/src/gpu/GrOpsTypes.h
Expand All @@ -2987,6 +2986,7 @@ FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.cpp
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.h
FILE: ../../../third_party/skia/src/gpu/SurfaceFillContext.cpp
FILE: ../../../third_party/skia/src/gpu/SurfaceFillContext.h
FILE: ../../../third_party/skia/src/gpu/geometry/GrInnerFanTriangulator.h
FILE: ../../../third_party/skia/src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp
FILE: ../../../third_party/skia/src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp
FILE: ../../../third_party/skia/src/gpu/v2/Device.cpp
Expand Down Expand Up @@ -3954,15 +3954,15 @@ FILE: ../../../third_party/skia/src/core/SkMipmapBuilder.h
FILE: ../../../third_party/skia/src/core/SkOpts_erms.cpp
FILE: ../../../third_party/skia/src/core/SkSamplingPriv.h
FILE: ../../../third_party/skia/src/core/SkVerticesPriv.h
FILE: ../../../third_party/skia/src/gpu/GrAATriangulator.cpp
FILE: ../../../third_party/skia/src/gpu/GrAATriangulator.h
FILE: ../../../third_party/skia/src/gpu/GrDynamicAtlas.cpp
FILE: ../../../third_party/skia/src/gpu/GrDynamicAtlas.h
FILE: ../../../third_party/skia/src/gpu/GrEagerVertexAllocator.h
FILE: ../../../third_party/skia/src/gpu/GrHashMapWithCache.h
FILE: ../../../third_party/skia/src/gpu/GrRecordingContextPriv.cpp
FILE: ../../../third_party/skia/src/gpu/GrThreadSafeCache.cpp
FILE: ../../../third_party/skia/src/gpu/GrThreadSafeCache.h
FILE: ../../../third_party/skia/src/gpu/geometry/GrAATriangulator.cpp
FILE: ../../../third_party/skia/src/gpu/geometry/GrAATriangulator.h
FILE: ../../../third_party/skia/src/gpu/geometry/GrWangsFormula.h
FILE: ../../../third_party/skia/src/gpu/mock/GrMockOpTarget.h
FILE: ../../../third_party/skia/src/gpu/ops/GrDrawAtlasPathOp.cpp
Expand Down