diff --git a/DEPS b/DEPS index c9b39b60c32fb..3d120b0a72446 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': '5754b81988b80b27fb932d10eaef6e19e949d0be', + 'skia_revision': 'aa592c60846d133540a812c390827c017228371b', # 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 2fcaacebb6d89..7d2a42c83401a 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 486c858ca2740cd9348569b6b5bb6853 +Signature: 62169fe1dfecf9f93023e0de0db27980 ==================================================================================================== LIBRARY: etc1 @@ -3183,7 +3183,7 @@ ORIGIN: ../../../third_party/skia/src/codec/SkMaskSwizzler.h + ../../../third_pa ORIGIN: ../../../third_party/skia/src/codec/SkMasks.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkMasks.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkPixmapUtils.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/codec/SkPixmapUtils.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/codec/SkPixmapUtilsPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkPngCodec.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkPngCodec.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkSampledCodec.cpp + ../../../third_party/skia/LICENSE @@ -3473,7 +3473,7 @@ FILE: ../../../third_party/skia/src/codec/SkMaskSwizzler.h FILE: ../../../third_party/skia/src/codec/SkMasks.cpp FILE: ../../../third_party/skia/src/codec/SkMasks.h FILE: ../../../third_party/skia/src/codec/SkPixmapUtils.cpp -FILE: ../../../third_party/skia/src/codec/SkPixmapUtils.h +FILE: ../../../third_party/skia/src/codec/SkPixmapUtilsPriv.h FILE: ../../../third_party/skia/src/codec/SkPngCodec.cpp FILE: ../../../third_party/skia/src/codec/SkPngCodec.h FILE: ../../../third_party/skia/src/codec/SkSampledCodec.cpp @@ -8959,9 +8959,11 @@ ORIGIN: ../../../third_party/skia/fuzz/FuzzCubicQuadRoots.cpp + ../../../third_p ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicQuadRoots.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/graphite_replay.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/android/SkImageAndroid.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/codec/SkPixmapUtils.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/core/SkEncodedImageFormat.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/core/SkICC.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/core/SkTextureCompressionType.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/gpu/ganesh/GrTextureGenerator.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/ganesh/SkImageGanesh.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/graphite/YUVABackendTextures.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/private/base/SkCPUTypes.h + ../../../third_party/skia/LICENSE @@ -8999,8 +9001,12 @@ ORIGIN: ../../../third_party/skia/src/gpu/GpuTypesPriv.h + ../../../third_party/ ORIGIN: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrPinnableImage.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrTextureGenerator.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_GaneshFactories.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_LazyTexture.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_LazyTexture.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/Image_YUVA_Graphite.cpp + ../../../third_party/skia/LICENSE @@ -9020,6 +9026,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphicsPipeline.cpp ORIGIN: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphicsPipeline.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/vk/VulkanSampler.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/vk/VulkanSampler.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/image/SkImageGeneratorPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/image/SkImage_AndroidFactories.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/image/SkImage_Base.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/image/SkImage_LazyFactories.cpp + ../../../third_party/skia/LICENSE @@ -9041,9 +9048,11 @@ FILE: ../../../third_party/skia/fuzz/FuzzCubicQuadRoots.cpp FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicQuadRoots.cpp FILE: ../../../third_party/skia/gm/graphite_replay.cpp FILE: ../../../third_party/skia/include/android/SkImageAndroid.h +FILE: ../../../third_party/skia/include/codec/SkPixmapUtils.h FILE: ../../../third_party/skia/include/core/SkEncodedImageFormat.h FILE: ../../../third_party/skia/include/core/SkICC.h FILE: ../../../third_party/skia/include/core/SkTextureCompressionType.h +FILE: ../../../third_party/skia/include/gpu/ganesh/GrTextureGenerator.h FILE: ../../../third_party/skia/include/gpu/ganesh/SkImageGanesh.h FILE: ../../../third_party/skia/include/gpu/graphite/YUVABackendTextures.h FILE: ../../../third_party/skia/include/private/base/SkCPUTypes.h @@ -9081,8 +9090,12 @@ FILE: ../../../third_party/skia/src/gpu/GpuTypesPriv.h FILE: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.h -FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrPinnableImage.cpp +FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrTextureGenerator.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_GaneshFactories.cpp +FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_LazyTexture.cpp +FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_LazyTexture.h +FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.cpp +FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.h FILE: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.cpp FILE: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.h FILE: ../../../third_party/skia/src/gpu/graphite/Image_YUVA_Graphite.cpp @@ -9102,6 +9115,7 @@ FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphicsPipeline.cpp FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphicsPipeline.h FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanSampler.cpp FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanSampler.h +FILE: ../../../third_party/skia/src/image/SkImageGeneratorPriv.h FILE: ../../../third_party/skia/src/image/SkImage_AndroidFactories.cpp FILE: ../../../third_party/skia/src/image/SkImage_Base.cpp FILE: ../../../third_party/skia/src/image/SkImage_LazyFactories.cpp