diff --git a/DEPS b/DEPS index 855e78414e3e8..57eb1269850fa 100644 --- a/DEPS +++ b/DEPS @@ -18,7 +18,7 @@ vars = { 'llvm_git': 'https://llvm.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': '19051bc5fc902035be957c50a42710f9add1d8c2', + 'skia_revision': '2718866006d234c9b95821477ff91340e3e1b542', # 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/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 3828da0637cc2..f7877d0d4fe76 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 7f5087db435528a9774ab2bfdd915e58 +Signature: e59888e7edcbc14e560fed033872dd8c ==================================================================================================== LIBRARY: etc1 @@ -388,7 +388,9 @@ FILE: ../../../third_party/skia/relnotes/SkPromiseImageTexture.md FILE: ../../../third_party/skia/relnotes/ddl_private.md FILE: ../../../third_party/skia/relnotes/skblenders_arithmetic_saturate.md FILE: ../../../third_party/skia/relnotes/skcolortable.md +FILE: ../../../third_party/skia/relnotes/skif_legacy_magnifier.md FILE: ../../../third_party/skia/relnotes/skif_runtimeshader_sampleradius.md +FILE: ../../../third_party/skia/relnotes/skimagefilters_alphathreshold_remove.md FILE: ../../../third_party/skia/relnotes/skimagefilters_image_remove.md FILE: ../../../third_party/skia/relnotes/skimagegenerator_grexternaltexturegenerator.md FILE: ../../../third_party/skia/relnotes/sksamplingoptions_implicit.md @@ -2307,7 +2309,6 @@ ORIGIN: ../../../third_party/skia/gm/gradient_dirty_laundry.cpp + ../../../third ORIGIN: ../../../third_party/skia/gm/gradient_matrix.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/gradients_no_texture.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/hairlines.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/gm/imagealphathreshold.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/imagesource.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/internal_links.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/inversepaths.cpp + ../../../third_party/skia/LICENSE @@ -2374,7 +2375,6 @@ ORIGIN: ../../../third_party/skia/src/core/SkStringUtils.h + ../../../third_part ORIGIN: ../../../third_party/skia/src/core/SkTDynamicHash.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkTMultiMap.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkValidationUtils.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/effects/imagefilters/SkComposeImageFilter.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/effects/imagefilters/SkDropShadowImageFilter.cpp + ../../../third_party/skia/LICENSE @@ -2449,7 +2449,6 @@ FILE: ../../../third_party/skia/gm/gradient_dirty_laundry.cpp FILE: ../../../third_party/skia/gm/gradient_matrix.cpp FILE: ../../../third_party/skia/gm/gradients_no_texture.cpp FILE: ../../../third_party/skia/gm/hairlines.cpp -FILE: ../../../third_party/skia/gm/imagealphathreshold.cpp FILE: ../../../third_party/skia/gm/imagesource.cpp FILE: ../../../third_party/skia/gm/internal_links.cpp FILE: ../../../third_party/skia/gm/inversepaths.cpp @@ -2516,7 +2515,6 @@ FILE: ../../../third_party/skia/src/core/SkStringUtils.h FILE: ../../../third_party/skia/src/core/SkTDynamicHash.h FILE: ../../../third_party/skia/src/core/SkTMultiMap.h FILE: ../../../third_party/skia/src/core/SkValidationUtils.h -FILE: ../../../third_party/skia/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp FILE: ../../../third_party/skia/src/effects/imagefilters/SkComposeImageFilter.cpp FILE: ../../../third_party/skia/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp FILE: ../../../third_party/skia/src/effects/imagefilters/SkDropShadowImageFilter.cpp @@ -8796,6 +8794,7 @@ ORIGIN: ../../../third_party/skia/include/ports/SkTypeface_fontations.h + ../../ ORIGIN: ../../../third_party/skia/include/private/SkGainmapInfo.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/SkGainmapShader.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/SkJpegGainmapEncoder.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/private/SkXmp.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/modules/skottie/include/SlotManager.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/modules/skottie/src/SlotManager.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu_bidi.h + ../../../third_party/skia/LICENSE @@ -8808,6 +8807,7 @@ ORIGIN: ../../../third_party/skia/src/codec/SkJpegSourceMgr.cpp + ../../../third ORIGIN: ../../../third_party/skia/src/codec/SkJpegSourceMgr.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkJpegXmp.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkJpegXmp.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/codec/SkXmp.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineContextUtils.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpContexts.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h + ../../../third_party/skia/LICENSE @@ -8831,6 +8831,7 @@ FILE: ../../../third_party/skia/include/ports/SkTypeface_fontations.h FILE: ../../../third_party/skia/include/private/SkGainmapInfo.h FILE: ../../../third_party/skia/include/private/SkGainmapShader.h FILE: ../../../third_party/skia/include/private/SkJpegGainmapEncoder.h +FILE: ../../../third_party/skia/include/private/SkXmp.h FILE: ../../../third_party/skia/modules/skottie/include/SlotManager.h FILE: ../../../third_party/skia/modules/skottie/src/SlotManager.cpp FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu_bidi.h @@ -8843,6 +8844,7 @@ FILE: ../../../third_party/skia/src/codec/SkJpegSourceMgr.cpp FILE: ../../../third_party/skia/src/codec/SkJpegSourceMgr.h FILE: ../../../third_party/skia/src/codec/SkJpegXmp.cpp FILE: ../../../third_party/skia/src/codec/SkJpegXmp.h +FILE: ../../../third_party/skia/src/codec/SkXmp.cpp FILE: ../../../third_party/skia/src/core/SkRasterPipelineContextUtils.h FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpContexts.h FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h @@ -9068,6 +9070,7 @@ ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLReturnsInputAlpha.cpp + ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLStructDefinition.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/sksl/transform/SkSLHoistSwitchVarDeclarationsAtTopLevel.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/toolchain/android_trampolines/gen_trampolines/gen_trampolines.go + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd @@ -9248,6 +9251,7 @@ FILE: ../../../third_party/skia/src/sksl/analysis/SkSLReturnsInputAlpha.cpp FILE: ../../../third_party/skia/src/sksl/ir/SkSLStructDefinition.cpp FILE: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.cpp FILE: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.h +FILE: ../../../third_party/skia/src/sksl/transform/SkSLHoistSwitchVarDeclarationsAtTopLevel.cpp FILE: ../../../third_party/skia/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp FILE: ../../../third_party/skia/toolchain/android_trampolines/gen_trampolines/gen_trampolines.go ----------------------------------------------------------------------------------------------------