From 92d81d63dad69ca2a55178e3636e804b3b4210cb Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Fri, 28 Apr 2023 23:53:16 -0400 Subject: [PATCH] Roll Skia from c7b3371bcd48 to 3a037528ab83 (2 revisions) (flutter/engine#41609) https://skia.googlesource.com/skia.git/+log/c7b3371bcd48..3a037528ab83 2023-04-29 armansito@google.com Remove piet-gpu code and dependencies 2023-04-29 armansito@google.com [graphite] Ref texture resources in a DispatchGroup 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 brianosman@google.com,jsimmons@google.com,rmistry@google.com,tdenniston@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 +- .../flutter/ci/licenses_golden/excluded_files | 3 --- .../src/flutter/ci/licenses_golden/licenses_skia | 16 +--------------- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/DEPS b/DEPS index d2c8f74d69..bd41516804 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': 'c7b3371bcd48b4b195be950cf6ee74f183a6ce15', + 'skia_revision': '3a037528ab83de9fc26b9fc873003b91c0166480', # 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/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index eb9571afba..3d68f35c68 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -2800,8 +2800,6 @@ ../../../third_party/skia/src/gpu/ganesh/vk/BUILD.bazel ../../../third_party/skia/src/gpu/gl/BUILD.bazel ../../../third_party/skia/src/gpu/mtl/BUILD.bazel -../../../third_party/skia/src/gpu/piet/BUILD.bazel -../../../third_party/skia/src/gpu/piet/README.md ../../../third_party/skia/src/gpu/tessellate/BUILD.bazel ../../../third_party/skia/src/gpu/vk/BUILD.bazel ../../../third_party/skia/src/image/BUILD.bazel @@ -2842,7 +2840,6 @@ ../../../third_party/skia/third_party/libjpeg-turbo ../../../third_party/skia/third_party/libpng ../../../third_party/skia/third_party/lua -../../../third_party/skia/third_party/piet-gpu/Makefile ../../../third_party/skia/third_party/vulkanmemoryallocator/BUILD.bazel ../../../third_party/skia/toolchain/BUILD.bazel ../../../third_party/skia/toolchain/android_trampolines/gen_trampolines/BUILD.bazel diff --git a/engine/src/flutter/ci/licenses_golden/licenses_skia b/engine/src/flutter/ci/licenses_golden/licenses_skia index f3eabc929a..a32f92a8ac 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: cbf55328783469998d1343d91f759471 +Signature: ba6c7ad462a099f10e28806312569279 ==================================================================================================== LIBRARY: etc1 @@ -8353,8 +8353,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/graphite/PaintParams.cpp + ../../../th ORIGIN: ../../../third_party/skia/src/gpu/graphite/PaintParams.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/PipelineData.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/PipelineData.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/Precompile.cpp + ../../../third_party/skia/LICENSE @@ -8575,8 +8573,6 @@ FILE: ../../../third_party/skia/src/gpu/graphite/PaintParams.cpp FILE: ../../../third_party/skia/src/gpu/graphite/PaintParams.h FILE: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.cpp FILE: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.h -FILE: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.cpp -FILE: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.h FILE: ../../../third_party/skia/src/gpu/graphite/PipelineData.cpp FILE: ../../../third_party/skia/src/gpu/graphite/PipelineData.h FILE: ../../../third_party/skia/src/gpu/graphite/Precompile.cpp @@ -8757,11 +8753,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/MutableTextureStateRef.h + ../../../th ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/piet/PietTypes.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/piet/Render.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/piet/Render.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/piet/Scene.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/piet/Scene.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/SkSLPosition.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd @@ -8779,11 +8770,6 @@ FILE: ../../../third_party/skia/src/gpu/MutableTextureStateRef.h FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp -FILE: ../../../third_party/skia/src/gpu/piet/PietTypes.h -FILE: ../../../third_party/skia/src/gpu/piet/Render.cpp -FILE: ../../../third_party/skia/src/gpu/piet/Render.h -FILE: ../../../third_party/skia/src/gpu/piet/Scene.cpp -FILE: ../../../third_party/skia/src/gpu/piet/Scene.h FILE: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h FILE: ../../../third_party/skia/src/sksl/SkSLPosition.cpp ----------------------------------------------------------------------------------------------------