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

Commit 7dd4754

Browse files
Roll Skia from 1a3adf848e61 to 8fdbbca7d35d (1 revision) (#42645)
https://skia.googlesource.com/skia.git/+log/1a3adf848e61..8fdbbca7d35d 2023-06-07 [email protected] Decouple SkShaders from Ganesh backend 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 [email protected],[email protected],[email protected],[email protected] 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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
1 parent ff7adb8 commit 7dd4754

File tree

2 files changed

+42
-14
lines changed

2 files changed

+42
-14
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': '1a3adf848e61905c97bac5626bb0a197f7ddcc1b',
21+
'skia_revision': '8fdbbca7d35db149148019993fe12df850b9970c',
2222

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

ci/licenses_golden/licenses_skia

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 96a67abacc02f7e503962cc39eb26642
1+
Signature: 224c68191877bf407c52d8706a25b41a
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -745,9 +745,8 @@ ORIGIN: ../../../third_party/skia/src/ports/SkOSFile_stdio.cpp + ../../../third_
745745
ORIGIN: ../../../third_party/skia/src/ports/SkScalerContext_mac_ct.cpp + ../../../third_party/skia/LICENSE
746746
ORIGIN: ../../../third_party/skia/src/ports/SkTypeface_mac_ct.cpp + ../../../third_party/skia/LICENSE
747747
ORIGIN: ../../../third_party/skia/src/shaders/SkBitmapProcShader.h + ../../../third_party/skia/LICENSE
748-
ORIGIN: ../../../third_party/skia/src/shaders/SkComposeShader.cpp + ../../../third_party/skia/LICENSE
748+
ORIGIN: ../../../third_party/skia/src/shaders/SkBlendShader.cpp + ../../../third_party/skia/LICENSE
749749
ORIGIN: ../../../third_party/skia/src/shaders/SkShader.cpp + ../../../third_party/skia/LICENSE
750-
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkGradientShader.cpp + ../../../third_party/skia/LICENSE
751750
ORIGIN: ../../../third_party/skia/src/utils/SkBase64.cpp + ../../../third_party/skia/LICENSE
752751
ORIGIN: ../../../third_party/skia/src/utils/SkCamera.cpp + ../../../third_party/skia/LICENSE
753752
ORIGIN: ../../../third_party/skia/src/utils/SkParse.cpp + ../../../third_party/skia/LICENSE
@@ -895,9 +894,8 @@ FILE: ../../../third_party/skia/src/ports/SkOSFile_stdio.cpp
895894
FILE: ../../../third_party/skia/src/ports/SkScalerContext_mac_ct.cpp
896895
FILE: ../../../third_party/skia/src/ports/SkTypeface_mac_ct.cpp
897896
FILE: ../../../third_party/skia/src/shaders/SkBitmapProcShader.h
898-
FILE: ../../../third_party/skia/src/shaders/SkComposeShader.cpp
897+
FILE: ../../../third_party/skia/src/shaders/SkBlendShader.cpp
899898
FILE: ../../../third_party/skia/src/shaders/SkShader.cpp
900-
FILE: ../../../third_party/skia/src/shaders/gradients/SkGradientShader.cpp
901899
FILE: ../../../third_party/skia/src/utils/SkBase64.cpp
902900
FILE: ../../../third_party/skia/src/utils/SkCamera.cpp
903901
FILE: ../../../third_party/skia/src/utils/SkParse.cpp
@@ -1987,12 +1985,13 @@ ORIGIN: ../../../third_party/skia/src/sfnt/SkOTUtils.cpp + ../../../third_party/
19871985
ORIGIN: ../../../third_party/skia/src/sfnt/SkOTUtils.h + ../../../third_party/skia/LICENSE
19881986
ORIGIN: ../../../third_party/skia/src/sfnt/SkPanose.h + ../../../third_party/skia/LICENSE
19891987
ORIGIN: ../../../third_party/skia/src/sfnt/SkSFNTHeader.h + ../../../third_party/skia/LICENSE
1990-
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkGradientShaderBase.h + ../../../third_party/skia/LICENSE
1988+
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkConicalGradient.cpp + ../../../third_party/skia/LICENSE
1989+
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkConicalGradient.h + ../../../third_party/skia/LICENSE
1990+
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkGradientBaseShader.h + ../../../third_party/skia/LICENSE
19911991
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkLinearGradient.cpp + ../../../third_party/skia/LICENSE
19921992
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkLinearGradient.h + ../../../third_party/skia/LICENSE
19931993
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkRadialGradient.cpp + ../../../third_party/skia/LICENSE
19941994
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkSweepGradient.cpp + ../../../third_party/skia/LICENSE
1995-
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkTwoPointConicalGradient.cpp + ../../../third_party/skia/LICENSE
19961995
ORIGIN: ../../../third_party/skia/src/utils/SkFloatUtils.h + ../../../third_party/skia/LICENSE
19971996
ORIGIN: ../../../third_party/skia/src/utils/SkNullCanvas.cpp + ../../../third_party/skia/LICENSE
19981997
ORIGIN: ../../../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp + ../../../third_party/skia/LICENSE
@@ -2146,12 +2145,13 @@ FILE: ../../../third_party/skia/src/sfnt/SkOTUtils.cpp
21462145
FILE: ../../../third_party/skia/src/sfnt/SkOTUtils.h
21472146
FILE: ../../../third_party/skia/src/sfnt/SkPanose.h
21482147
FILE: ../../../third_party/skia/src/sfnt/SkSFNTHeader.h
2149-
FILE: ../../../third_party/skia/src/shaders/gradients/SkGradientShaderBase.h
2148+
FILE: ../../../third_party/skia/src/shaders/gradients/SkConicalGradient.cpp
2149+
FILE: ../../../third_party/skia/src/shaders/gradients/SkConicalGradient.h
2150+
FILE: ../../../third_party/skia/src/shaders/gradients/SkGradientBaseShader.h
21502151
FILE: ../../../third_party/skia/src/shaders/gradients/SkLinearGradient.cpp
21512152
FILE: ../../../third_party/skia/src/shaders/gradients/SkLinearGradient.h
21522153
FILE: ../../../third_party/skia/src/shaders/gradients/SkRadialGradient.cpp
21532154
FILE: ../../../third_party/skia/src/shaders/gradients/SkSweepGradient.cpp
2154-
FILE: ../../../third_party/skia/src/shaders/gradients/SkTwoPointConicalGradient.cpp
21552155
FILE: ../../../third_party/skia/src/utils/SkFloatUtils.h
21562156
FILE: ../../../third_party/skia/src/utils/SkNullCanvas.cpp
21572157
FILE: ../../../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp
@@ -2416,7 +2416,8 @@ ORIGIN: ../../../third_party/skia/src/ports/SkOSFile_win.cpp + ../../../third_pa
24162416
ORIGIN: ../../../third_party/skia/src/sfnt/SkOTTable_name.cpp + ../../../third_party/skia/LICENSE
24172417
ORIGIN: ../../../third_party/skia/src/sfnt/SkTTCFHeader.h + ../../../third_party/skia/LICENSE
24182418
ORIGIN: ../../../third_party/skia/src/shaders/SkColorFilterShader.cpp + ../../../third_party/skia/LICENSE
2419-
ORIGIN: ../../../third_party/skia/src/shaders/SkPerlinNoiseShader.cpp + ../../../third_party/skia/LICENSE
2419+
ORIGIN: ../../../third_party/skia/src/shaders/SkPerlinNoiseShaderImpl.cpp + ../../../third_party/skia/LICENSE
2420+
ORIGIN: ../../../third_party/skia/src/shaders/SkPerlinNoiseShaderImpl.h + ../../../third_party/skia/LICENSE
24202421
ORIGIN: ../../../third_party/skia/src/utils/SkCanvasStack.cpp + ../../../third_party/skia/LICENSE
24212422
ORIGIN: ../../../third_party/skia/src/utils/SkCanvasStack.h + ../../../third_party/skia/LICENSE
24222423
ORIGIN: ../../../third_party/skia/src/utils/SkCanvasStateUtils.cpp + ../../../third_party/skia/LICENSE
@@ -2557,7 +2558,8 @@ FILE: ../../../third_party/skia/src/ports/SkOSFile_win.cpp
25572558
FILE: ../../../third_party/skia/src/sfnt/SkOTTable_name.cpp
25582559
FILE: ../../../third_party/skia/src/sfnt/SkTTCFHeader.h
25592560
FILE: ../../../third_party/skia/src/shaders/SkColorFilterShader.cpp
2560-
FILE: ../../../third_party/skia/src/shaders/SkPerlinNoiseShader.cpp
2561+
FILE: ../../../third_party/skia/src/shaders/SkPerlinNoiseShaderImpl.cpp
2562+
FILE: ../../../third_party/skia/src/shaders/SkPerlinNoiseShaderImpl.h
25612563
FILE: ../../../third_party/skia/src/utils/SkCanvasStack.cpp
25622564
FILE: ../../../third_party/skia/src/utils/SkCanvasStack.h
25632565
FILE: ../../../third_party/skia/src/utils/SkCanvasStateUtils.cpp
@@ -8419,7 +8421,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.h + .
84198421
ORIGIN: ../../../third_party/skia/src/gpu/tessellate/LinearTolerances.h + ../../../third_party/skia/LICENSE
84208422
ORIGIN: ../../../third_party/skia/src/gpu/vk/VulkanUtilsPriv.h + ../../../third_party/skia/LICENSE
84218423
ORIGIN: ../../../third_party/skia/src/shaders/SkEmptyShader.cpp + ../../../third_party/skia/LICENSE
8422-
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkGradientShaderBase.cpp + ../../../third_party/skia/LICENSE
8424+
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkGradientBaseShader.cpp + ../../../third_party/skia/LICENSE
84238425
ORIGIN: ../../../third_party/skia/src/sksl/SkSLModuleLoader.cpp + ../../../third_party/skia/LICENSE
84248426
ORIGIN: ../../../third_party/skia/src/sksl/SkSLModuleLoader.h + ../../../third_party/skia/LICENSE
84258427
ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp + ../../../third_party/skia/LICENSE
@@ -8639,7 +8641,7 @@ FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.h
86398641
FILE: ../../../third_party/skia/src/gpu/tessellate/LinearTolerances.h
86408642
FILE: ../../../third_party/skia/src/gpu/vk/VulkanUtilsPriv.h
86418643
FILE: ../../../third_party/skia/src/shaders/SkEmptyShader.cpp
8642-
FILE: ../../../third_party/skia/src/shaders/gradients/SkGradientShaderBase.cpp
8644+
FILE: ../../../third_party/skia/src/shaders/gradients/SkGradientBaseShader.cpp
86438645
FILE: ../../../third_party/skia/src/sksl/SkSLModuleLoader.cpp
86448646
FILE: ../../../third_party/skia/src/sksl/SkSLModuleLoader.h
86458647
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp
@@ -8989,6 +8991,8 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrFragmentProcessors.cpp + ../.
89898991
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrFragmentProcessors.h + ../../../third_party/skia/LICENSE
89908992
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.cpp + ../../../third_party/skia/LICENSE
89918993
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.h + ../../../third_party/skia/LICENSE
8994+
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.cpp + ../../../third_party/skia/LICENSE
8995+
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.h + ../../../third_party/skia/LICENSE
89928996
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp + ../../../third_party/skia/LICENSE
89938997
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.h + ../../../third_party/skia/LICENSE
89948998
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrTextureGenerator.cpp + ../../../third_party/skia/LICENSE
@@ -9043,6 +9047,17 @@ ORIGIN: ../../../third_party/skia/src/image/SkSurface_Null.cpp + ../../../third_
90439047
ORIGIN: ../../../third_party/skia/src/ports/fontations/src/ffi.rs + ../../../third_party/skia/LICENSE
90449048
ORIGIN: ../../../third_party/skia/src/ports/fontations/src/skpath_bridge.cpp + ../../../third_party/skia/LICENSE
90459049
ORIGIN: ../../../third_party/skia/src/ports/fontations/src/skpath_bridge.h + ../../../third_party/skia/LICENSE
9050+
ORIGIN: ../../../third_party/skia/src/shaders/SkBlendShader.h + ../../../third_party/skia/LICENSE
9051+
ORIGIN: ../../../third_party/skia/src/shaders/SkColorShader.h + ../../../third_party/skia/LICENSE
9052+
ORIGIN: ../../../third_party/skia/src/shaders/SkCoordClampShader.h + ../../../third_party/skia/LICENSE
9053+
ORIGIN: ../../../third_party/skia/src/shaders/SkEmptyShader.h + ../../../third_party/skia/LICENSE
9054+
ORIGIN: ../../../third_party/skia/src/shaders/SkRuntimeShader.cpp + ../../../third_party/skia/LICENSE
9055+
ORIGIN: ../../../third_party/skia/src/shaders/SkRuntimeShader.h + ../../../third_party/skia/LICENSE
9056+
ORIGIN: ../../../third_party/skia/src/shaders/SkShaderBase.cpp + ../../../third_party/skia/LICENSE
9057+
ORIGIN: ../../../third_party/skia/src/shaders/SkTriColorShader.cpp + ../../../third_party/skia/LICENSE
9058+
ORIGIN: ../../../third_party/skia/src/shaders/SkTriColorShader.h + ../../../third_party/skia/LICENSE
9059+
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkRadialGradient.h + ../../../third_party/skia/LICENSE
9060+
ORIGIN: ../../../third_party/skia/src/shaders/gradients/SkSweepGradient.h + ../../../third_party/skia/LICENSE
90469061
ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo.cpp + ../../../third_party/skia/LICENSE
90479062
ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLGetReturnComplexity.cpp + ../../../third_party/skia/LICENSE
90489063
ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression.cpp + ../../../third_party/skia/LICENSE
@@ -9142,6 +9157,8 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/GrFragmentProcessors.cpp
91429157
FILE: ../../../third_party/skia/src/gpu/ganesh/GrFragmentProcessors.h
91439158
FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.cpp
91449159
FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.h
9160+
FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.cpp
9161+
FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.h
91459162
FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp
91469163
FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.h
91479164
FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrTextureGenerator.cpp
@@ -9196,6 +9213,17 @@ FILE: ../../../third_party/skia/src/image/SkSurface_Null.cpp
91969213
FILE: ../../../third_party/skia/src/ports/fontations/src/ffi.rs
91979214
FILE: ../../../third_party/skia/src/ports/fontations/src/skpath_bridge.cpp
91989215
FILE: ../../../third_party/skia/src/ports/fontations/src/skpath_bridge.h
9216+
FILE: ../../../third_party/skia/src/shaders/SkBlendShader.h
9217+
FILE: ../../../third_party/skia/src/shaders/SkColorShader.h
9218+
FILE: ../../../third_party/skia/src/shaders/SkCoordClampShader.h
9219+
FILE: ../../../third_party/skia/src/shaders/SkEmptyShader.h
9220+
FILE: ../../../third_party/skia/src/shaders/SkRuntimeShader.cpp
9221+
FILE: ../../../third_party/skia/src/shaders/SkRuntimeShader.h
9222+
FILE: ../../../third_party/skia/src/shaders/SkShaderBase.cpp
9223+
FILE: ../../../third_party/skia/src/shaders/SkTriColorShader.cpp
9224+
FILE: ../../../third_party/skia/src/shaders/SkTriColorShader.h
9225+
FILE: ../../../third_party/skia/src/shaders/gradients/SkRadialGradient.h
9226+
FILE: ../../../third_party/skia/src/shaders/gradients/SkSweepGradient.h
91999227
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo.cpp
92009228
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetReturnComplexity.cpp
92019229
FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression.cpp

0 commit comments

Comments
 (0)