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

Commit a818cb1

Browse files
Roll Skia from 957ed75731e0 to 7020699e3835 (7 revisions) (#28145)
1 parent e9bf299 commit a818cb1

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ vars = {
2727
'skia_git': 'https://skia.googlesource.com',
2828
# OCMock is for testing only so there is no google clone
2929
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
30-
'skia_revision': '957ed75731e015482bbd71ad512867aa8bdfbcd5',
30+
'skia_revision': '7020699e383560c1e4e30aa6a6c2b94dfbf94544',
3131

3232
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
3333
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

ci/licenses_golden/licenses_skia

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: eb3e8def48e6b8f1d95cb63bbcf2f973
1+
Signature: e767373f4cf99e856550532d4f7e1452
22

33
UNUSED LICENSES:
44

@@ -2468,14 +2468,16 @@ FILE: ../../../third_party/skia/src/gpu/GrSimpleMesh.h
24682468
FILE: ../../../third_party/skia/src/gpu/GrTTopoSort.h
24692469
FILE: ../../../third_party/skia/src/gpu/GrTestUtils.cpp
24702470
FILE: ../../../third_party/skia/src/gpu/GrTestUtils.h
2471-
FILE: ../../../third_party/skia/src/gpu/GrTriangulator.cpp
2472-
FILE: ../../../third_party/skia/src/gpu/GrTriangulator.h
24732471
FILE: ../../../third_party/skia/src/gpu/GrXferProcessor.cpp
24742472
FILE: ../../../third_party/skia/src/gpu/effects/GrBlendFragmentProcessor.cpp
24752473
FILE: ../../../third_party/skia/src/gpu/effects/GrBlendFragmentProcessor.h
24762474
FILE: ../../../third_party/skia/src/gpu/effects/GrCustomXfermode.cpp
24772475
FILE: ../../../third_party/skia/src/gpu/effects/GrCustomXfermode.h
2476+
FILE: ../../../third_party/skia/src/gpu/geometry/GrAAConvexTessellator.cpp
2477+
FILE: ../../../third_party/skia/src/gpu/geometry/GrAAConvexTessellator.h
24782478
FILE: ../../../third_party/skia/src/gpu/geometry/GrQuad.h
2479+
FILE: ../../../third_party/skia/src/gpu/geometry/GrTriangulator.cpp
2480+
FILE: ../../../third_party/skia/src/gpu/geometry/GrTriangulator.h
24792481
FILE: ../../../third_party/skia/src/gpu/gl/GrGLTextureRenderTarget.cpp
24802482
FILE: ../../../third_party/skia/src/gpu/gl/GrGLUniformHandler.cpp
24812483
FILE: ../../../third_party/skia/src/gpu/gl/GrGLUniformHandler.h
@@ -2488,8 +2490,6 @@ FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLProgramDataManager.h
24882490
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLUniformHandler.h
24892491
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLVarying.cpp
24902492
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLVarying.h
2491-
FILE: ../../../third_party/skia/src/gpu/ops/GrAAConvexTessellator.cpp
2492-
FILE: ../../../third_party/skia/src/gpu/ops/GrAAConvexTessellator.h
24932493
FILE: ../../../third_party/skia/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
24942494
FILE: ../../../third_party/skia/src/gpu/ops/GrAALinearizingConvexPathRenderer.h
24952495
FILE: ../../../third_party/skia/src/gpu/ops/GrAtlasTextOp.cpp
@@ -2974,7 +2974,6 @@ FILE: ../../../third_party/skia/src/gpu/BaseDevice.cpp
29742974
FILE: ../../../third_party/skia/src/gpu/BaseDevice.h
29752975
FILE: ../../../third_party/skia/src/gpu/GrDstProxyView.h
29762976
FILE: ../../../third_party/skia/src/gpu/GrEagerVertexAllocator.cpp
2977-
FILE: ../../../third_party/skia/src/gpu/GrInnerFanTriangulator.h
29782977
FILE: ../../../third_party/skia/src/gpu/GrMeshDrawTarget.cpp
29792978
FILE: ../../../third_party/skia/src/gpu/GrMeshDrawTarget.h
29802979
FILE: ../../../third_party/skia/src/gpu/GrOpsTypes.h
@@ -2987,6 +2986,7 @@ FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.cpp
29872986
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.h
29882987
FILE: ../../../third_party/skia/src/gpu/SurfaceFillContext.cpp
29892988
FILE: ../../../third_party/skia/src/gpu/SurfaceFillContext.h
2989+
FILE: ../../../third_party/skia/src/gpu/geometry/GrInnerFanTriangulator.h
29902990
FILE: ../../../third_party/skia/src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp
29912991
FILE: ../../../third_party/skia/src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp
29922992
FILE: ../../../third_party/skia/src/gpu/v2/Device.cpp
@@ -3954,15 +3954,15 @@ FILE: ../../../third_party/skia/src/core/SkMipmapBuilder.h
39543954
FILE: ../../../third_party/skia/src/core/SkOpts_erms.cpp
39553955
FILE: ../../../third_party/skia/src/core/SkSamplingPriv.h
39563956
FILE: ../../../third_party/skia/src/core/SkVerticesPriv.h
3957-
FILE: ../../../third_party/skia/src/gpu/GrAATriangulator.cpp
3958-
FILE: ../../../third_party/skia/src/gpu/GrAATriangulator.h
39593957
FILE: ../../../third_party/skia/src/gpu/GrDynamicAtlas.cpp
39603958
FILE: ../../../third_party/skia/src/gpu/GrDynamicAtlas.h
39613959
FILE: ../../../third_party/skia/src/gpu/GrEagerVertexAllocator.h
39623960
FILE: ../../../third_party/skia/src/gpu/GrHashMapWithCache.h
39633961
FILE: ../../../third_party/skia/src/gpu/GrRecordingContextPriv.cpp
39643962
FILE: ../../../third_party/skia/src/gpu/GrThreadSafeCache.cpp
39653963
FILE: ../../../third_party/skia/src/gpu/GrThreadSafeCache.h
3964+
FILE: ../../../third_party/skia/src/gpu/geometry/GrAATriangulator.cpp
3965+
FILE: ../../../third_party/skia/src/gpu/geometry/GrAATriangulator.h
39663966
FILE: ../../../third_party/skia/src/gpu/geometry/GrWangsFormula.h
39673967
FILE: ../../../third_party/skia/src/gpu/mock/GrMockOpTarget.h
39683968
FILE: ../../../third_party/skia/src/gpu/ops/GrDrawAtlasPathOp.cpp

0 commit comments

Comments
 (0)