From f16b85fc15ac7da85a95e2cea48c0c718c00307a Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Wed, 12 Jun 2024 20:38:05 -0400 Subject: [PATCH] Roll Skia from be6a57569a92 to b2f163ae11bf (5 revisions) (flutter/engine#53357) https://skia.googlesource.com/skia.git/+log/be6a57569a92..b2f163ae11bf 2024-06-12 robertphillips@google.com [graphite] Rearrange code to match exposed Precompile API 2024-06-12 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from efa3591618f5 to 9a693759186a (6 revisions) 2024-06-12 robertphillips@google.com [graphite] Begin exposing Precompilation API 2024-06-12 bungeman@google.com Add needed include to SkPathRef.cpp 2024-06-12 bungeman@google.com Remove SkScalerContextRec::fPaintGamma 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,bungeman@google.com,chinmaygarde@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://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md --- DEPS | 2 +- .../flutter/ci/licenses_golden/licenses_skia | 20 ++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 73e6dc1023..fac4382017 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ vars = { 'flutter_git': 'https://flutter.googlesource.com', 'skia_git': 'https://skia.googlesource.com', 'llvm_git': 'https://llvm.googlesource.com', - 'skia_revision': 'be6a57569a9231391212684995486bcef16e5cfb', + 'skia_revision': 'b2f163ae11bfaf0bca2eb8fcdbc51b2fd6f71012', # 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 63dc37edcc..c76bed8ed6 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 6903fc87c223b73921aee8a25343c538 +Signature: e40fc6d0ec2fcd9b62c81ebc3d60e3eb ==================================================================================================== LIBRARY: etc1 @@ -8083,7 +8083,6 @@ ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/KeyContext.h + ../../ ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/KeyHelpers.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/KeyHelpers.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Log.h + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PaintOptionsPriv.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParams.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParams.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParamsKey.cpp + ../../../flutter/third_party/skia/LICENSE @@ -8091,8 +8090,8 @@ ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParamsKey.h + .. ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PipelineData.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PipelineData.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Precompile.cpp + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Precompile.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PrecompileBasePriv.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PrecompileInternal.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PublicPrecompile.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PublicPrecompile.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/QueueManager.cpp + ../../../flutter/third_party/skia/LICENSE @@ -8151,6 +8150,7 @@ ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlQueueManager.h ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlQueueManager.mm + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlSampler.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlSampler.mm + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PaintOptionsPriv.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/BitmapTextRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE @@ -8301,7 +8301,6 @@ FILE: ../../../flutter/third_party/skia/src/gpu/graphite/KeyContext.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/KeyHelpers.cpp FILE: ../../../flutter/third_party/skia/src/gpu/graphite/KeyHelpers.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Log.h -FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PaintOptionsPriv.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParams.cpp FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParams.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParamsKey.cpp @@ -8309,8 +8308,8 @@ FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParamsKey.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PipelineData.cpp FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PipelineData.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Precompile.cpp -FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Precompile.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PrecompileBasePriv.h +FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PrecompileInternal.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PublicPrecompile.cpp FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PublicPrecompile.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/QueueManager.cpp @@ -8369,6 +8368,7 @@ FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlQueueManager.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlQueueManager.mm FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlSampler.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlSampler.mm +FILE: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PaintOptionsPriv.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.cpp FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/BitmapTextRenderStep.cpp @@ -9511,6 +9511,8 @@ ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSem ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSurface.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/epoxy/GrGLMakeEpoxyEGLInterface.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PaintOptions.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/Precompile.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_coretext.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_factory.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_harfbuzz.h + ../../../flutter/third_party/skia/LICENSE @@ -9550,6 +9552,9 @@ ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ScratchResourceManage ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ScratchResourceManager.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/AnalyticBlurMask.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/AnalyticBlurMask.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PaintOption.cpp + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PaintOption.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PaintOptions.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/AnalyticBlurRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/AnalyticBlurRenderStep.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/SDFTextLCDRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE @@ -9574,6 +9579,8 @@ FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSemap FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSurface.h FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h FILE: ../../../flutter/third_party/skia/include/gpu/gl/epoxy/GrGLMakeEpoxyEGLInterface.h +FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PaintOptions.h +FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/Precompile.h FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_coretext.h FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_factory.h FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_harfbuzz.h @@ -9613,6 +9620,9 @@ FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ScratchResourceManager. FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ScratchResourceManager.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/AnalyticBlurMask.cpp FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/AnalyticBlurMask.h +FILE: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PaintOption.cpp +FILE: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PaintOption.h +FILE: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PaintOptions.cpp FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/AnalyticBlurRenderStep.cpp FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/AnalyticBlurRenderStep.h FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/SDFTextLCDRenderStep.cpp