From 685fbc6f4d9db8026c56ee1a177bb10cc09f884b Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Fri, 24 Mar 2023 18:07:47 -0400 Subject: [PATCH] Roll Skia from 86228d7534de to 497dc2e1f01f (14 revisions) (#40611) Roll Skia from 86228d7534de to 497dc2e1f01f (14 revisions) --- DEPS | 2 +- ci/licenses_golden/excluded_files | 1 + ci/licenses_golden/licenses_skia | 14 +++++++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 86c1dcbad5e3f..2ed8b59723ee7 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': '86228d7534de1c4f3daf2c0b24fe8c772beed720', + 'skia_revision': '497dc2e1f01fe5aeaf53b7361dc2b2efff0995c6', # 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/excluded_files b/ci/licenses_golden/excluded_files index ac858e2a3fca7..29008a5478bda 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2625,6 +2625,7 @@ ../../../third_party/skia/include/gpu/BUILD.bazel ../../../third_party/skia/include/gpu/d3d/BUILD.bazel ../../../third_party/skia/include/gpu/dawn/BUILD.bazel +../../../third_party/skia/include/gpu/ganesh/BUILD.bazel ../../../third_party/skia/include/gpu/gl/BUILD.bazel ../../../third_party/skia/include/gpu/gl/egl/BUILD.bazel ../../../third_party/skia/include/gpu/gl/glx/BUILD.bazel diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 03d25e4d299d8..dec05afbba84a 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 210989a7c4f537f36336e6ad3bdb8692 +Signature: 4445c450a10e9368ae9189b3d000bb8c ==================================================================================================== LIBRARY: etc1 @@ -8959,6 +8959,7 @@ ORIGIN: ../../../third_party/skia/include/android/SkImageAndroid.h + ../../../th 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/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 ORIGIN: ../../../third_party/skia/src/base/SkBezierCurves.h + ../../../third_party/skia/LICENSE @@ -8985,6 +8986,8 @@ ORIGIN: ../../../third_party/skia/src/encode/SkEncoder.cpp + ../../../third_part ORIGIN: ../../../third_party/skia/src/gpu/DitherUtils.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/DitherUtils.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrImageUtils.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrImageUtils.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrPinnableImage.cpp + ../../../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 @@ -9001,7 +9004,10 @@ ORIGIN: ../../../third_party/skia/src/gpu/graphite/compute/DispatchGroup.h + ../ ORIGIN: ../../../third_party/skia/src/gpu/graphite/geom/EdgeAAQuad.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_GaneshFactories.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/image/SkImage_LazyFactories.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/image/SkImage_Raster.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/image/SkImage_RasterFactories.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/image/SkSurface_Base.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/image/SkSurface_Null.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo.cpp + ../../../third_party/skia/LICENSE @@ -9018,6 +9024,7 @@ FILE: ../../../third_party/skia/include/android/SkImageAndroid.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/SkImageGanesh.h FILE: ../../../third_party/skia/include/gpu/graphite/YUVABackendTextures.h FILE: ../../../third_party/skia/include/private/base/SkCPUTypes.h FILE: ../../../third_party/skia/src/base/SkBezierCurves.h @@ -9044,6 +9051,8 @@ FILE: ../../../third_party/skia/src/encode/SkEncoder.cpp FILE: ../../../third_party/skia/src/gpu/DitherUtils.cpp FILE: ../../../third_party/skia/src/gpu/DitherUtils.h FILE: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h +FILE: ../../../third_party/skia/src/gpu/ganesh/GrImageUtils.cpp +FILE: ../../../third_party/skia/src/gpu/ganesh/GrImageUtils.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrPinnableImage.cpp FILE: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.cpp FILE: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.h @@ -9060,7 +9069,10 @@ FILE: ../../../third_party/skia/src/gpu/graphite/compute/DispatchGroup.h FILE: ../../../third_party/skia/src/gpu/graphite/geom/EdgeAAQuad.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_GaneshFactories.cpp +FILE: ../../../third_party/skia/src/image/SkImage_LazyFactories.cpp FILE: ../../../third_party/skia/src/image/SkImage_Raster.h +FILE: ../../../third_party/skia/src/image/SkImage_RasterFactories.cpp FILE: ../../../third_party/skia/src/image/SkSurface_Base.cpp FILE: ../../../third_party/skia/src/image/SkSurface_Null.cpp FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo.cpp