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

Commit 872bf18

Browse files
skia-flutter-autorollskia-flutter-autoroll
committed
Roll Skia from ca108745b1de to cd3d3daafe55 (1 revision)
https://skia.googlesource.com/skia.git/+log/ca108745b1de..cd3d3daafe55 2024-08-28 kjlubick@google.com Move remaining Ganesh files in include/gpu and add shims If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC brianosman@google.com,egdaniel@google.com,matanl@google.com,rmistry@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Skia: https://bugs.chromium.org/p/skia/issues/entry To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
1 parent 0416fa3 commit 872bf18

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': 'ca108745b1de1ce366393013c441abc8012794f5',
17+
'skia_revision': 'cd3d3daafe559192288d12cde5722034b935df7f',
1818

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

‎ci/licenses_golden/licenses_skia‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 36f9a4aa48517b97d1c84e5d710a42f5
1+
Signature: 5c4c9dd0368b677df27bacf7e0931d40
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -1229,6 +1229,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12291229
====================================================================================================
12301230
LIBRARY: skia
12311231
ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrTypes.h + ../../../flutter/third_party/skia/LICENSE
1232+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/GrTypes.h + ../../../flutter/third_party/skia/LICENSE
12321233
ORIGIN: ../../../flutter/third_party/skia/src/base/SkTBlockList.h + ../../../flutter/third_party/skia/LICENSE
12331234
ORIGIN: ../../../flutter/third_party/skia/src/core/SkImageInfo.cpp + ../../../flutter/third_party/skia/LICENSE
12341235
ORIGIN: ../../../flutter/third_party/skia/src/core/SkRasterClip.cpp + ../../../flutter/third_party/skia/LICENSE
@@ -1250,6 +1251,7 @@ ORIGIN: ../../../flutter/third_party/skia/src/ports/SkDebug_win.cpp + ../../../f
12501251
ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/Glyph.h + ../../../flutter/third_party/skia/LICENSE
12511252
TYPE: LicenseType.bsd
12521253
FILE: ../../../flutter/third_party/skia/include/gpu/GrTypes.h
1254+
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/GrTypes.h
12531255
FILE: ../../../flutter/third_party/skia/src/base/SkTBlockList.h
12541256
FILE: ../../../flutter/third_party/skia/src/core/SkImageInfo.cpp
12551257
FILE: ../../../flutter/third_party/skia/src/core/SkRasterClip.cpp
@@ -3123,6 +3125,7 @@ ORIGIN: ../../../flutter/third_party/skia/include/core/SkPoint3.h + ../../../flu
31233125
ORIGIN: ../../../flutter/third_party/skia/include/core/SkRSXform.h + ../../../flutter/third_party/skia/LICENSE
31243126
ORIGIN: ../../../flutter/third_party/skia/include/core/SkTraceMemoryDump.h + ../../../flutter/third_party/skia/LICENSE
31253127
ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrContextOptions.h + ../../../flutter/third_party/skia/LICENSE
3128+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/GrContextOptions.h + ../../../flutter/third_party/skia/LICENSE
31263129
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLTypes.h + ../../../flutter/third_party/skia/LICENSE
31273130
ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/GrGLTypes.h + ../../../flutter/third_party/skia/LICENSE
31283131
ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_android.h + ../../../flutter/third_party/skia/LICENSE
@@ -3402,6 +3405,7 @@ FILE: ../../../flutter/third_party/skia/include/core/SkPoint3.h
34023405
FILE: ../../../flutter/third_party/skia/include/core/SkRSXform.h
34033406
FILE: ../../../flutter/third_party/skia/include/core/SkTraceMemoryDump.h
34043407
FILE: ../../../flutter/third_party/skia/include/gpu/GrContextOptions.h
3408+
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/GrContextOptions.h
34053409
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLTypes.h
34063410
FILE: ../../../flutter/third_party/skia/include/gpu/gl/GrGLTypes.h
34073411
FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_android.h
@@ -4519,6 +4523,8 @@ ORIGIN: ../../../flutter/third_party/skia/include/encode/SkPngEncoder.h + ../../
45194523
ORIGIN: ../../../flutter/third_party/skia/include/encode/SkWebpEncoder.h + ../../../flutter/third_party/skia/LICENSE
45204524
ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrBackendSemaphore.h + ../../../flutter/third_party/skia/LICENSE
45214525
ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrBackendSurface.h + ../../../flutter/third_party/skia/LICENSE
4526+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/GrBackendSemaphore.h + ../../../flutter/third_party/skia/LICENSE
4527+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/GrBackendSurface.h + ../../../flutter/third_party/skia/LICENSE
45224528
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mock/GrMockTypes.h + ../../../flutter/third_party/skia/LICENSE
45234529
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlTypes.h + ../../../flutter/third_party/skia/LICENSE
45244530
ORIGIN: ../../../flutter/third_party/skia/include/gpu/mock/GrMockTypes.h + ../../../flutter/third_party/skia/LICENSE
@@ -4739,6 +4745,8 @@ FILE: ../../../flutter/third_party/skia/include/encode/SkPngEncoder.h
47394745
FILE: ../../../flutter/third_party/skia/include/encode/SkWebpEncoder.h
47404746
FILE: ../../../flutter/third_party/skia/include/gpu/GrBackendSemaphore.h
47414747
FILE: ../../../flutter/third_party/skia/include/gpu/GrBackendSurface.h
4748+
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/GrBackendSemaphore.h
4749+
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/GrBackendSurface.h
47424750
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mock/GrMockTypes.h
47434751
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlTypes.h
47444752
FILE: ../../../flutter/third_party/skia/include/gpu/mock/GrMockTypes.h
@@ -4996,6 +5004,7 @@ ORIGIN: ../../../flutter/third_party/skia/include/core/SkSpan.h + ../../../flutt
49965004
ORIGIN: ../../../flutter/third_party/skia/include/effects/SkShaderMaskFilter.h + ../../../flutter/third_party/skia/LICENSE
49975005
ORIGIN: ../../../flutter/third_party/skia/include/effects/SkTrimPathEffect.h + ../../../flutter/third_party/skia/LICENSE
49985006
ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrDriverBugWorkarounds.h + ../../../flutter/third_party/skia/LICENSE
5007+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/GrDriverBugWorkarounds.h + ../../../flutter/third_party/skia/LICENSE
49995008
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/vk/GrBackendDrawableInfo.h + ../../../flutter/third_party/skia/LICENSE
50005009
ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_fuchsia.h + ../../../flutter/third_party/skia/LICENSE
50015010
ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkMacros.h + ../../../flutter/third_party/skia/LICENSE
@@ -5210,6 +5219,7 @@ FILE: ../../../flutter/third_party/skia/include/core/SkSpan.h
52105219
FILE: ../../../flutter/third_party/skia/include/effects/SkShaderMaskFilter.h
52115220
FILE: ../../../flutter/third_party/skia/include/effects/SkTrimPathEffect.h
52125221
FILE: ../../../flutter/third_party/skia/include/gpu/GrDriverBugWorkarounds.h
5222+
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/GrDriverBugWorkarounds.h
52135223
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/vk/GrBackendDrawableInfo.h
52145224
FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_fuchsia.h
52155225
FILE: ../../../flutter/third_party/skia/include/private/base/SkMacros.h
@@ -5633,9 +5643,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
56335643
====================================================================================================
56345644
LIBRARY: skia
56355645
ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h + ../../../LICENSE
5646+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/GrDriverBugWorkaroundsAutogen.h + ../../../LICENSE
56365647
ORIGIN: ../../../flutter/third_party/skia/include/utils/SkTraceEventPhase.h + ../../../LICENSE
56375648
TYPE: LicenseType.bsd
56385649
FILE: ../../../flutter/third_party/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h
5650+
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/GrDriverBugWorkaroundsAutogen.h
56395651
FILE: ../../../flutter/third_party/skia/include/utils/SkTraceEventPhase.h
56405652
----------------------------------------------------------------------------------------------------
56415653
Copyright 2018 The Chromium Authors. All rights reserved.
@@ -5693,6 +5705,8 @@ ORIGIN: ../../../flutter/third_party/skia/include/android/GrAHardwareBufferUtils
56935705
ORIGIN: ../../../flutter/third_party/skia/include/core/SkTileMode.h + ../../../flutter/third_party/skia/LICENSE
56945706
ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrContextThreadSafeProxy.h + ../../../flutter/third_party/skia/LICENSE
56955707
ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrRecordingContext.h + ../../../flutter/third_party/skia/LICENSE
5708+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/GrContextThreadSafeProxy.h + ../../../flutter/third_party/skia/LICENSE
5709+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/GrRecordingContext.h + ../../../flutter/third_party/skia/LICENSE
56965710
ORIGIN: ../../../flutter/third_party/skia/include/ports/SkCFObject.h + ../../../flutter/third_party/skia/LICENSE
56975711
ORIGIN: ../../../flutter/third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h + ../../../flutter/third_party/skia/LICENSE
56985712
ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrContext_Base.h + ../../../flutter/third_party/skia/LICENSE
@@ -5811,6 +5825,8 @@ FILE: ../../../flutter/third_party/skia/include/android/GrAHardwareBufferUtils.h
58115825
FILE: ../../../flutter/third_party/skia/include/core/SkTileMode.h
58125826
FILE: ../../../flutter/third_party/skia/include/gpu/GrContextThreadSafeProxy.h
58135827
FILE: ../../../flutter/third_party/skia/include/gpu/GrRecordingContext.h
5828+
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/GrContextThreadSafeProxy.h
5829+
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/GrRecordingContext.h
58145830
FILE: ../../../flutter/third_party/skia/include/ports/SkCFObject.h
58155831
FILE: ../../../flutter/third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h
58165832
FILE: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrContext_Base.h
@@ -6379,6 +6395,7 @@ ORIGIN: ../../../flutter/third_party/skia/gm/widebuttcaps.cpp + ../../../flutter
63796395
ORIGIN: ../../../flutter/third_party/skia/include/core/SkM44.h + ../../../flutter/third_party/skia/LICENSE
63806396
ORIGIN: ../../../flutter/third_party/skia/include/core/SkSamplingOptions.h + ../../../flutter/third_party/skia/LICENSE
63816397
ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrDirectContext.h + ../../../flutter/third_party/skia/LICENSE
6398+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/GrDirectContext.h + ../../../flutter/third_party/skia/LICENSE
63826399
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendContext.h + ../../../flutter/third_party/skia/LICENSE
63836400
ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkTPin.h + ../../../flutter/third_party/skia/LICENSE
63846401
ORIGIN: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer.cpp + ../../../flutter/third_party/skia/LICENSE
@@ -6510,6 +6527,7 @@ FILE: ../../../flutter/third_party/skia/gm/widebuttcaps.cpp
65106527
FILE: ../../../flutter/third_party/skia/include/core/SkM44.h
65116528
FILE: ../../../flutter/third_party/skia/include/core/SkSamplingOptions.h
65126529
FILE: ../../../flutter/third_party/skia/include/gpu/GrDirectContext.h
6530+
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/GrDirectContext.h
65136531
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendContext.h
65146532
FILE: ../../../flutter/third_party/skia/include/private/base/SkTPin.h
65156533
FILE: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer.cpp
@@ -6673,6 +6691,7 @@ ORIGIN: ../../../flutter/third_party/skia/include/core/SkYUVAPixmaps.h + ../../.
66736691
ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrYUVABackendTextures.h + ../../../flutter/third_party/skia/LICENSE
66746692
ORIGIN: ../../../flutter/third_party/skia/include/gpu/d3d/GrD3DBackendContext.h + ../../../flutter/third_party/skia/LICENSE
66756693
ORIGIN: ../../../flutter/third_party/skia/include/gpu/d3d/GrD3DTypes.h + ../../../flutter/third_party/skia/LICENSE
6694+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/GrYUVABackendTextures.h + ../../../flutter/third_party/skia/LICENSE
66766695
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/d3d/GrD3DBackendContext.h + ../../../flutter/third_party/skia/LICENSE
66776696
ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/d3d/GrD3DTypes.h + ../../../flutter/third_party/skia/LICENSE
66786697
ORIGIN: ../../../flutter/third_party/skia/include/ports/SkImageGeneratorNDK.h + ../../../flutter/third_party/skia/LICENSE
@@ -6809,6 +6828,7 @@ FILE: ../../../flutter/third_party/skia/include/core/SkYUVAPixmaps.h
68096828
FILE: ../../../flutter/third_party/skia/include/gpu/GrYUVABackendTextures.h
68106829
FILE: ../../../flutter/third_party/skia/include/gpu/d3d/GrD3DBackendContext.h
68116830
FILE: ../../../flutter/third_party/skia/include/gpu/d3d/GrD3DTypes.h
6831+
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/GrYUVABackendTextures.h
68126832
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/d3d/GrD3DBackendContext.h
68136833
FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/d3d/GrD3DTypes.h
68146834
FILE: ../../../flutter/third_party/skia/include/ports/SkImageGeneratorNDK.h

0 commit comments

Comments
 (0)