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

Roll Skia from 82fe4d2243a3 to 2f4652f3096b (11 revisions) #24975

Merged
merged 1 commit into from
Mar 12, 2021
Merged

Roll Skia from 82fe4d2243a3 to 2f4652f3096b (11 revisions) #24975

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': '82fe4d2243a31c626818b9a185af8bcdc08c9c22',
'skia_revision': '2f4652f3096b54b84d227c85eae7b03eb18e2aa2',

# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the
Expand Down
28 changes: 1 addition & 27 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: 5a4e3c083f19a5f53cc6e1bf1262cb9f
Signature: 4b35da79e2cd46c9913170f20259d95b

UNUSED LICENSES:

Expand Down Expand Up @@ -3090,16 +3090,9 @@ FILE: ../../../third_party/skia/src/gpu/GrProxyProvider.h
FILE: ../../../third_party/skia/src/gpu/GrResourceProviderPriv.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCClipPath.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCClipPath.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCConicShader.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCConicShader.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCDrawPathsOp.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCDrawPathsOp.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCPathCache.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCPathCache.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCPerFlushResources.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCPerFlushResources.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCPerOpsTaskPaths.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCSTLList.h
FILE: ../../../third_party/skia/src/gpu/effects/GrAARectEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrAlphaThresholdFragmentProcessor.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrCircleBlurFragmentProcessor.fp
Expand Down Expand Up @@ -3443,18 +3436,6 @@ FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCAtlas.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCAtlas.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCClipProcessor.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCClipProcessor.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCCoverageProcessor.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCCoverageProcessor.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCCubicShader.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCCubicShader.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCFillGeometry.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCFillGeometry.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCFiller.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCFiller.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCPathProcessor.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCPathProcessor.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCQuadraticShader.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCQuadraticShader.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.h
FILE: ../../../third_party/skia/src/gpu/effects/GrAtlasedShaderHelpers.h
Expand Down Expand Up @@ -3925,7 +3906,6 @@ 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/ccpr/GrAutoMapVertexBuffer.h
FILE: ../../../third_party/skia/src/gpu/effects/GrArithmeticProcessor.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrDitherEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrArithmeticProcessor.cpp
Expand Down Expand Up @@ -5116,9 +5096,6 @@ FILE: ../../../third_party/skia/src/core/SkPixelRefPriv.h
FILE: ../../../third_party/skia/src/core/SkTextBlobTrace.cpp
FILE: ../../../third_party/skia/src/core/SkTextBlobTrace.h
FILE: ../../../third_party/skia/src/gpu/GrPersistentCacheUtils.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrSampleMaskProcessor.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrSampleMaskProcessor.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrStencilAtlasOp.h
FILE: ../../../third_party/skia/src/gpu/effects/GrComposeLerpEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpEffect.h
Expand Down Expand Up @@ -5640,9 +5617,6 @@ FILE: ../../../third_party/skia/src/gpu/GrSPIRVVaryingHandler.cpp
FILE: ../../../third_party/skia/src/gpu/GrSPIRVVaryingHandler.h
FILE: ../../../third_party/skia/src/gpu/GrSamplePatternDictionary.cpp
FILE: ../../../third_party/skia/src/gpu/GrSamplePatternDictionary.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrOctoBounds.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrOctoBounds.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrStencilAtlasOp.cpp
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnAttachment.cpp
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnAttachment.h
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnBuffer.cpp
Expand Down