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

Roll Skia from 16bf7d31c819 to 4d48bb35972f (32 revisions) #19635

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 @@ -26,7 +26,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': '16bf7d31c8192c37bba1c7451ac578e73d2350ca',
'skia_revision': '4d48bb35972fdd94b27ce2739b9298a1267fe50e',

# 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
10 changes: 6 additions & 4 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: ee2a74fc1bbe8b7b0ba6a4a1a7382d19
Signature: 2a799019fc34e7d0a1ab20d60b9a80eb

UNUSED LICENSES:

Expand Down Expand Up @@ -1927,7 +1927,6 @@ FILE: ../../../third_party/skia/src/gpu/GrRectanizerSkyline.h
FILE: ../../../third_party/skia/src/gpu/GrResourceCache.cpp
FILE: ../../../third_party/skia/src/gpu/GrResourceCache.h
FILE: ../../../third_party/skia/src/gpu/GrSurfacePriv.h
FILE: ../../../third_party/skia/src/gpu/GrTRecorder.h
FILE: ../../../third_party/skia/src/gpu/GrTexturePriv.h
FILE: ../../../third_party/skia/src/gpu/GrTracing.h
FILE: ../../../third_party/skia/src/gpu/GrXferProcessor.h
Expand Down Expand Up @@ -2541,7 +2540,6 @@ FILE: ../../../third_party/skia/src/gpu/text/GrTextBlob.cpp
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlob.h
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobCache.cpp
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobCache.h
FILE: ../../../third_party/skia/src/gpu/text/GrTextTarget.h
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.cpp
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.h
FILE: ../../../third_party/skia/src/gpu/vk/GrVkCaps.cpp
Expand Down Expand Up @@ -3219,7 +3217,6 @@ TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/bench/ClearBench.cpp
FILE: ../../../third_party/skia/bench/CompositingImagesBench.cpp
FILE: ../../../third_party/skia/bench/CubicMapBench.cpp
FILE: ../../../third_party/skia/bench/GrCCFillGeometryBench.cpp
FILE: ../../../third_party/skia/bench/ImageCycleBench.cpp
FILE: ../../../third_party/skia/bench/JSONBench.cpp
FILE: ../../../third_party/skia/bench/PathOpsBench.cpp
Expand Down Expand Up @@ -3934,6 +3931,8 @@ FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCaps.cpp
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCaps.h
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCommandList.cpp
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCommandList.h
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCommandSignature.cpp
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCommandSignature.h
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DConstantRingBuffer.cpp
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DConstantRingBuffer.h
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DCpuDescriptorManager.cpp
Expand Down Expand Up @@ -5310,6 +5309,9 @@ FILE: ../../../third_party/skia/src/gpu/GrStagingBuffer.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrAutoMapVertexBuffer.h
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnStagingBuffer.cpp
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnStagingBuffer.h
FILE: ../../../third_party/skia/src/gpu/effects/GrDitherEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrDitherEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrDitherEffect.h
FILE: ../../../third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
Expand Down