diff --git a/DEPS b/DEPS index 74e3f8f1c9a..ca6cde99384 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ vars = { 'flutter_git': 'https://flutter.googlesource.com', 'skia_git': 'https://skia.googlesource.com', 'llvm_git': 'https://llvm.googlesource.com', - 'skia_revision': 'd7f79d7183cdc523e79aaac9a6b2a3da11954631', + 'skia_revision': '1f74f67959f207f0f8a3b29c2f8258f3881fef10', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index f2eb85b4191..37a4d6cb031 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -2644,6 +2644,11 @@ ../../../flutter/third_party/skia/include/gpu/d3d/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/ganesh/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/ganesh/gl/BUILD.bazel +../../../flutter/third_party/skia/include/gpu/ganesh/gl/egl/BUILD.bazel +../../../flutter/third_party/skia/include/gpu/ganesh/gl/epoxy/BUILD.bazel +../../../flutter/third_party/skia/include/gpu/ganesh/gl/glx/BUILD.bazel +../../../flutter/third_party/skia/include/gpu/ganesh/gl/ios/BUILD.bazel +../../../flutter/third_party/skia/include/gpu/ganesh/gl/mac/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/ganesh/vk/BUILD.bazel ../../../flutter/third_party/skia/include/gpu/gl/BUILD.bazel diff --git a/engine/src/flutter/ci/licenses_golden/licenses_skia b/engine/src/flutter/ci/licenses_golden/licenses_skia index 332f1432bdb..7e00c9a7a84 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 5dc69cf578a7e64445c13daad26c765c +Signature: 6847c3331723bc7b0ac1e7b44c4db31b ==================================================================================================== LIBRARY: etc1 @@ -397,6 +397,9 @@ FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/pathops.bench.js FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html FILE: ../../../flutter/third_party/skia/package-lock.json +FILE: ../../../flutter/third_party/skia/relnotes/ios_gl.md +FILE: ../../../flutter/third_party/skia/relnotes/mac_gl.md +FILE: ../../../flutter/third_party/skia/relnotes/moved_interfaces.md FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl @@ -4990,7 +4993,6 @@ ORIGIN: ../../../flutter/third_party/skia/include/core/SkFontTypes.h + ../../../ ORIGIN: ../../../flutter/third_party/skia/include/core/SkSpan.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/effects/SkShaderMaskFilter.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/effects/SkTrimPathEffect.h + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrBackendDrawableInfo.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrDriverBugWorkarounds.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/vk/GrBackendDrawableInfo.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/vk/GrVkMemoryAllocator.h + ../../../flutter/third_party/skia/LICENSE @@ -5205,7 +5207,6 @@ FILE: ../../../flutter/third_party/skia/include/core/SkFontTypes.h FILE: ../../../flutter/third_party/skia/include/core/SkSpan.h FILE: ../../../flutter/third_party/skia/include/effects/SkShaderMaskFilter.h FILE: ../../../flutter/third_party/skia/include/effects/SkTrimPathEffect.h -FILE: ../../../flutter/third_party/skia/include/gpu/GrBackendDrawableInfo.h FILE: ../../../flutter/third_party/skia/include/gpu/GrDriverBugWorkarounds.h FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/vk/GrBackendDrawableInfo.h FILE: ../../../flutter/third_party/skia/include/gpu/vk/GrVkMemoryAllocator.h @@ -7293,6 +7294,8 @@ ORIGIN: ../../../flutter/third_party/skia/include/core/SkBlender.h + ../../../fl ORIGIN: ../../../flutter/third_party/skia/include/core/SkMesh.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/effects/SkBlenders.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ShaderErrorHandler.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/egl/GrGLMakeEGLInterface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/glx/GrGLMakeGLXInterface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/BackendTexture.h + ../../../flutter/third_party/skia/LICENSE @@ -7506,6 +7509,8 @@ FILE: ../../../flutter/third_party/skia/include/core/SkBlender.h FILE: ../../../flutter/third_party/skia/include/core/SkMesh.h FILE: ../../../flutter/third_party/skia/include/effects/SkBlenders.h FILE: ../../../flutter/third_party/skia/include/gpu/ShaderErrorHandler.h +FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.h +FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.h FILE: ../../../flutter/third_party/skia/include/gpu/gl/egl/GrGLMakeEGLInterface.h FILE: ../../../flutter/third_party/skia/include/gpu/gl/glx/GrGLMakeGLXInterface.h FILE: ../../../flutter/third_party/skia/include/gpu/graphite/BackendTexture.h @@ -9490,6 +9495,9 @@ ORIGIN: ../../../flutter/third_party/skia/gm/emptyshader.cpp + ../../../flutter/ ORIGIN: ../../../flutter/third_party/skia/gm/imagedither.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/gm/rendertomipmappedyuvimageplanes.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLMakeWebGLInterface.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/epoxy/GrGLMakeEpoxyEGLInterface.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/ios/GrGLMakeIOSInterface.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/mac/GrGLMakeMacInterface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSemaphore.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSurface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h + ../../../flutter/third_party/skia/LICENSE @@ -9538,6 +9546,9 @@ FILE: ../../../flutter/third_party/skia/gm/emptyshader.cpp FILE: ../../../flutter/third_party/skia/gm/imagedither.cpp FILE: ../../../flutter/third_party/skia/gm/rendertomipmappedyuvimageplanes.cpp FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLMakeWebGLInterface.h +FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/epoxy/GrGLMakeEpoxyEGLInterface.h +FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/ios/GrGLMakeIOSInterface.h +FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/mac/GrGLMakeMacInterface.h FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSemaphore.h FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSurface.h FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h