diff --git a/DEPS b/DEPS index 32742e8c56..1dfa907126 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': 'a690bd1fb8b8311426052b61114b8963d7e7c69b', + 'skia_revision': '1cf6f71c81206fd9deb46d68540dd167f98b79b3', # 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/licenses_skia b/engine/src/flutter/ci/licenses_golden/licenses_skia index 91cdb2a1a7..5b7128ba42 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 0512a3a99dba81bed959cec501350206 +Signature: 2e68f7484b2ce0b671e307290ef12cc4 ==================================================================================================== LIBRARY: etc1 @@ -4684,7 +4684,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/TextureOp.cpp + ../../../th ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/TextureOp.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSemaphore.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSemaphore.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/opts/SkUtils_opts.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/opts/SkMemset_opts.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/pdf/SkKeyedImage.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/pdf/SkKeyedImage.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/pdf/SkPDFGradientShader.cpp + ../../../third_party/skia/LICENSE @@ -4906,7 +4906,7 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/ops/TextureOp.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/ops/TextureOp.h FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSemaphore.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSemaphore.h -FILE: ../../../third_party/skia/src/opts/SkUtils_opts.h +FILE: ../../../third_party/skia/src/opts/SkMemset_opts.h FILE: ../../../third_party/skia/src/pdf/SkKeyedImage.cpp FILE: ../../../third_party/skia/src/pdf/SkKeyedImage.h FILE: ../../../third_party/skia/src/pdf/SkPDFGradientShader.cpp @@ -6585,8 +6585,8 @@ ORIGIN: ../../../third_party/skia/src/core/SkColorFilterPriv.h + ../../../third_ ORIGIN: ../../../third_party/skia/src/core/SkCompressedDataUtils.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkCompressedDataUtils.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkM44.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkMemset_opts_erms.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkMipmapBuilder.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/core/SkOpts_erms.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkSamplingPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkVerticesPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrDynamicAtlas.cpp + ../../../third_party/skia/LICENSE @@ -6719,8 +6719,8 @@ FILE: ../../../third_party/skia/src/core/SkColorFilterPriv.h FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.cpp FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.h FILE: ../../../third_party/skia/src/core/SkM44.cpp +FILE: ../../../third_party/skia/src/core/SkMemset_opts_erms.cpp FILE: ../../../third_party/skia/src/core/SkMipmapBuilder.h -FILE: ../../../third_party/skia/src/core/SkOpts_erms.cpp FILE: ../../../third_party/skia/src/core/SkSamplingPriv.h FILE: ../../../third_party/skia/src/core/SkVerticesPriv.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrDynamicAtlas.cpp @@ -8928,6 +8928,9 @@ ORIGIN: ../../../third_party/skia/src/core/SkDrawBase.cpp + ../../../third_party ORIGIN: ../../../third_party/skia/src/core/SkDrawBase.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkFontMetricsPriv.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkFontMetricsPriv.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkMemset.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkMemset_opts.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkMemset_opts_avx.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkMipmapBuilder.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkPixmapDraw.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRSXform.cpp + ../../../third_party/skia/LICENSE @@ -9161,6 +9164,9 @@ FILE: ../../../third_party/skia/src/core/SkDrawBase.cpp FILE: ../../../third_party/skia/src/core/SkDrawBase.h FILE: ../../../third_party/skia/src/core/SkFontMetricsPriv.cpp FILE: ../../../third_party/skia/src/core/SkFontMetricsPriv.h +FILE: ../../../third_party/skia/src/core/SkMemset.h +FILE: ../../../third_party/skia/src/core/SkMemset_opts.cpp +FILE: ../../../third_party/skia/src/core/SkMemset_opts_avx.cpp FILE: ../../../third_party/skia/src/core/SkMipmapBuilder.cpp FILE: ../../../third_party/skia/src/core/SkPixmapDraw.cpp FILE: ../../../third_party/skia/src/core/SkRSXform.cpp