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

Commit aa155ee

Browse files
Roll Skia from 9c0b79a to e17b050 (15 revisions) (#21707)
1 parent 7e20575 commit aa155ee

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ vars = {
2626
'skia_git': 'https://skia.googlesource.com',
2727
# OCMock is for testing only so there is no google clone
2828
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
29-
'skia_revision': '9c0b79a3548993e5883287238405f7734110dc2c',
29+
'skia_revision': 'e17b0501963aac4840e280c7ac175fd38e4a0c9d',
3030

3131
# When updating the Dart revision, ensure that all entries that are
3232
# dependencies of Dart are also updated to match the entries in the

ci/licenses_golden/licenses_skia

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: b4a6293d0c7db2f2b8d7883e4977328c
1+
Signature: c05ecdf25a4f555ea48de1e26068b217
22

33
UNUSED LICENSES:
44

@@ -1694,6 +1694,8 @@ FILE: ../../../third_party/skia/src/effects/SkColorMatrixFilter.cpp
16941694
FILE: ../../../third_party/skia/src/effects/SkLayerDrawLooper.cpp
16951695
FILE: ../../../third_party/skia/src/effects/SkPackBits.cpp
16961696
FILE: ../../../third_party/skia/src/effects/SkTableMaskFilter.cpp
1697+
FILE: ../../../third_party/skia/src/gpu/GrAttachment.cpp
1698+
FILE: ../../../third_party/skia/src/gpu/GrAttachment.h
16971699
FILE: ../../../third_party/skia/src/gpu/GrContext.cpp
16981700
FILE: ../../../third_party/skia/src/gpu/GrGpu.h
16991701
FILE: ../../../third_party/skia/src/gpu/GrGpuResource.cpp
@@ -1705,14 +1707,14 @@ FILE: ../../../third_party/skia/src/gpu/GrPathRendererChain.cpp
17051707
FILE: ../../../third_party/skia/src/gpu/GrPathRendererChain.h
17061708
FILE: ../../../third_party/skia/src/gpu/GrRenderTarget.cpp
17071709
FILE: ../../../third_party/skia/src/gpu/GrRenderTarget.h
1708-
FILE: ../../../third_party/skia/src/gpu/GrStencilAttachment.cpp
1709-
FILE: ../../../third_party/skia/src/gpu/GrStencilAttachment.h
17101710
FILE: ../../../third_party/skia/src/gpu/GrStencilSettings.cpp
17111711
FILE: ../../../third_party/skia/src/gpu/GrTexture.cpp
17121712
FILE: ../../../third_party/skia/src/gpu/GrTexture.h
17131713
FILE: ../../../third_party/skia/src/gpu/SkGpuDevice.cpp
17141714
FILE: ../../../third_party/skia/src/gpu/geometry/GrPathUtils.cpp
17151715
FILE: ../../../third_party/skia/src/gpu/geometry/GrPathUtils.h
1716+
FILE: ../../../third_party/skia/src/gpu/gl/GrGLAttachment.cpp
1717+
FILE: ../../../third_party/skia/src/gpu/gl/GrGLAttachment.h
17161718
FILE: ../../../third_party/skia/src/gpu/gl/GrGLDefines.h
17171719
FILE: ../../../third_party/skia/src/gpu/gl/GrGLGLSL.cpp
17181720
FILE: ../../../third_party/skia/src/gpu/gl/GrGLGLSL.h
@@ -1725,8 +1727,6 @@ FILE: ../../../third_party/skia/src/gpu/gl/GrGLProgram.cpp
17251727
FILE: ../../../third_party/skia/src/gpu/gl/GrGLProgram.h
17261728
FILE: ../../../third_party/skia/src/gpu/gl/GrGLRenderTarget.cpp
17271729
FILE: ../../../third_party/skia/src/gpu/gl/GrGLRenderTarget.h
1728-
FILE: ../../../third_party/skia/src/gpu/gl/GrGLStencilAttachment.cpp
1729-
FILE: ../../../third_party/skia/src/gpu/gl/GrGLStencilAttachment.h
17301730
FILE: ../../../third_party/skia/src/gpu/gl/GrGLTexture.cpp
17311731
FILE: ../../../third_party/skia/src/gpu/gl/GrGLTexture.h
17321732
FILE: ../../../third_party/skia/src/gpu/gl/GrGLUtil.cpp
@@ -2555,6 +2555,8 @@ FILE: ../../../third_party/skia/src/gpu/text/GrTextBlob.cpp
25552555
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlob.h
25562556
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobCache.cpp
25572557
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobCache.h
2558+
FILE: ../../../third_party/skia/src/gpu/vk/GrVkAttachment.cpp
2559+
FILE: ../../../third_party/skia/src/gpu/vk/GrVkAttachment.h
25582560
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.cpp
25592561
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.h
25602562
FILE: ../../../third_party/skia/src/gpu/vk/GrVkCaps.cpp
@@ -2575,8 +2577,6 @@ FILE: ../../../third_party/skia/src/gpu/vk/GrVkRenderPass.cpp
25752577
FILE: ../../../third_party/skia/src/gpu/vk/GrVkRenderPass.h
25762578
FILE: ../../../third_party/skia/src/gpu/vk/GrVkRenderTarget.cpp
25772579
FILE: ../../../third_party/skia/src/gpu/vk/GrVkRenderTarget.h
2578-
FILE: ../../../third_party/skia/src/gpu/vk/GrVkStencilAttachment.cpp
2579-
FILE: ../../../third_party/skia/src/gpu/vk/GrVkStencilAttachment.h
25802580
FILE: ../../../third_party/skia/src/gpu/vk/GrVkTexture.cpp
25812581
FILE: ../../../third_party/skia/src/gpu/vk/GrVkTexture.h
25822582
FILE: ../../../third_party/skia/src/gpu/vk/GrVkTextureRenderTarget.cpp
@@ -3141,6 +3141,8 @@ FILE: ../../../third_party/skia/src/gpu/ccpr/GrOctoBounds.cpp
31413141
FILE: ../../../third_party/skia/src/gpu/ccpr/GrOctoBounds.h
31423142
FILE: ../../../third_party/skia/src/gpu/ccpr/GrStencilAtlasOp.cpp
31433143
FILE: ../../../third_party/skia/src/gpu/ccpr/GrVSCoverageProcessor.h
3144+
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnAttachment.cpp
3145+
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnAttachment.h
31443146
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnBuffer.cpp
31453147
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnBuffer.h
31463148
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnCaps.cpp
@@ -3157,8 +3159,6 @@ FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnRenderTarget.cpp
31573159
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnRenderTarget.h
31583160
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnRingBuffer.cpp
31593161
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnRingBuffer.h
3160-
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnStencilAttachment.cpp
3161-
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnStencilAttachment.h
31623162
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnTexture.cpp
31633163
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnTexture.h
31643164
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnTextureRenderTarget.cpp
@@ -3459,6 +3459,8 @@ FILE: ../../../third_party/skia/src/gpu/gradients/generated/GrTwoPointConicalGra
34593459
FILE: ../../../third_party/skia/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.h
34603460
FILE: ../../../third_party/skia/src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.cpp
34613461
FILE: ../../../third_party/skia/src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.h
3462+
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlAttachment.h
3463+
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlAttachment.mm
34623464
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlBuffer.h
34633465
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlBuffer.mm
34643466
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCppUtil.h
@@ -3475,8 +3477,6 @@ FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlResourceProvider.h
34753477
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlResourceProvider.mm
34763478
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlSampler.h
34773479
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlSampler.mm
3478-
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlStencilAttachment.h
3479-
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlStencilAttachment.mm
34803480
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlTextureRenderTarget.h
34813481
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlTextureRenderTarget.mm
34823482
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlUniformHandler.h
@@ -3778,12 +3778,12 @@ FILE: ../../../third_party/skia/src/gpu/gl/GrGLSemaphore.cpp
37783778
FILE: ../../../third_party/skia/src/gpu/gl/GrGLSemaphore.h
37793779
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp
37803780
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.h
3781+
FILE: ../../../third_party/skia/src/gpu/mock/GrMockAttachment.h
37813782
FILE: ../../../third_party/skia/src/gpu/mock/GrMockBuffer.h
37823783
FILE: ../../../third_party/skia/src/gpu/mock/GrMockCaps.h
37833784
FILE: ../../../third_party/skia/src/gpu/mock/GrMockGpu.cpp
37843785
FILE: ../../../third_party/skia/src/gpu/mock/GrMockGpu.h
37853786
FILE: ../../../third_party/skia/src/gpu/mock/GrMockOpsRenderPass.h
3786-
FILE: ../../../third_party/skia/src/gpu/mock/GrMockStencilAttachment.h
37873787
FILE: ../../../third_party/skia/src/gpu/mock/GrMockTexture.h
37883788
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCaps.h
37893789
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCaps.mm
@@ -3944,6 +3944,8 @@ FILE: ../../../third_party/skia/src/gpu/GrUnrefDDLTask.h
39443944
FILE: ../../../third_party/skia/src/gpu/GrUtil.cpp
39453945
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DAMDMemoryAllocator.cpp
39463946
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DAMDMemoryAllocator.h
3947+
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DAttachment.cpp
3948+
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DAttachment.h
39473949
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DBuffer.cpp
39483950
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DBuffer.h
39493951
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCaps.cpp
@@ -3976,8 +3978,6 @@ FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DRootSignature.cpp
39763978
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DRootSignature.h
39773979
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DSemaphore.cpp
39783980
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DSemaphore.h
3979-
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DStencilAttachment.cpp
3980-
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DStencilAttachment.h
39813981
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DTexture.cpp
39823982
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DTexture.h
39833983
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DTextureRenderTarget.cpp
@@ -4011,7 +4011,6 @@ FILE: ../../../third_party/skia/src/sksl/SkSLInliner.h
40114011
FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.cpp
40124012
FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.h
40134013
FILE: ../../../third_party/skia/src/sksl/SkSLSampleUsage.cpp
4014-
FILE: ../../../third_party/skia/src/sksl/SkSLTinyUnorderedMap.h
40154014
FILE: ../../../third_party/skia/src/sksl/ir/SkSLInlineMarker.h
40164015
FILE: ../../../third_party/skia/src/sksl/ir/SkSLSymbolAlias.h
40174016
FILE: ../../../third_party/skia/src/utils/SkCustomTypeface.cpp
@@ -4150,8 +4149,8 @@ FILE: ../../../third_party/skia/src/gpu/GrEagerVertexAllocator.h
41504149
FILE: ../../../third_party/skia/src/gpu/GrHashMapWithCache.h
41514150
FILE: ../../../third_party/skia/src/gpu/GrRecordingContextPriv.cpp
41524151
FILE: ../../../third_party/skia/src/gpu/GrSTArenaList.h
4153-
FILE: ../../../third_party/skia/src/gpu/GrThreadSafeUniquelyKeyedProxyViewCache.cpp
4154-
FILE: ../../../third_party/skia/src/gpu/GrThreadSafeUniquelyKeyedProxyViewCache.h
4152+
FILE: ../../../third_party/skia/src/gpu/GrThreadSafeCache.cpp
4153+
FILE: ../../../third_party/skia/src/gpu/GrThreadSafeCache.h
41554154
FILE: ../../../third_party/skia/src/gpu/ccpr/GrAutoMapVertexBuffer.h
41564155
FILE: ../../../third_party/skia/src/gpu/effects/GrArithmeticProcessor.fp
41574156
FILE: ../../../third_party/skia/src/gpu/effects/GrDitherEffect.fp

0 commit comments

Comments
 (0)