From c0500853753538b55b34cf5a3e541da4e6864be1 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Tue, 21 Mar 2023 23:16:13 +0000 Subject: [PATCH] Roll Skia from 6cdd4b3f9b8e to 3e6bfdfea566 (3 revisions) https://skia.googlesource.com/skia.git/+log/6cdd4b3f9b8e..3e6bfdfea566 2023-03-21 kjlubick@google.com Revert "Reland "Introduce SkImages namespace; remove Ganesh GPU code from SkImage_Raster"" 2023-03-21 kjlubick@google.com Remove duplicate files from GPU file list 2023-03-21 brianosman@google.com Remove unused helper structs in SkAnalyticEdge.h If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC armansito@google.com,bdero@google.com,brianosman@google.com,rmistry@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Skia: https://bugs.chromium.org/p/skia/issues/entry To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md --- DEPS | 2 +- ci/licenses_golden/excluded_files | 1 - ci/licenses_golden/licenses_skia | 14 +------------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/DEPS b/DEPS index 7b75ed9c634e7..8d9d41cef8c01 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': '6cdd4b3f9b8e09531ea4c18ad7f29be744d579cd', + 'skia_revision': '3e6bfdfea566b8368b10cd911499ae1bb09d3004', # 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 b8eabec2deac9..73d6cee994deb 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2624,7 +2624,6 @@ ../../../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 b5452f0aa9798..e4aea3e38fa6f 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 5e6e18831204a6df6060152d713e56a2 +Signature: 7d0a8a3ede16fa2e555c56783e631b68 ==================================================================================================== LIBRARY: etc1 @@ -8963,7 +8963,6 @@ ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicQuadRoots.cpp + ../../. 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/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 @@ -8989,8 +8988,6 @@ 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 @@ -9007,10 +9004,7 @@ 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 @@ -9023,7 +9017,6 @@ 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/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 @@ -9049,8 +9042,6 @@ 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 @@ -9067,10 +9058,7 @@ 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