From 4d5a6457e846e0f9d2a26cf6ff31baf233e200d5 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Wed, 15 Jun 2022 21:00:06 +0000 Subject: [PATCH] Roll Skia from 48d421cc9811 to 4a375fe2138e (6 revisions) https://skia.googlesource.com/skia.git/+log/48d421cc9811..4a375fe2138e 2022-06-15 herb@google.com Move SkSubRun to src/text 2022-06-15 herb@google.com Remove some unneeded SkSpan calls 2022-06-15 johnstiles@google.com Add pointer-data fields to PaintParamsKey and KeyBuilder. 2022-06-15 ethannicholas@google.com Added preliminary SkSL Metal compute shader support 2022-06-15 jsimmons@google.com Adjust LineMetrics ascent/descent based on the line height multiplier 2022-06-15 brianosman@google.com Disable wayland in ANGLE 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 johnstiles@google.com,kaushikiska@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/licenses_skia | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 5aebe4a9a4452..a405176dc99a9 100644 --- a/DEPS +++ b/DEPS @@ -27,7 +27,7 @@ vars = { 'skia_git': 'https://skia.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': '48d421cc98118640a59863c156e5b266c4f298d1', + 'skia_revision': '4a375fe2138efdb7d8fc5ab2c1acabb71369bcad', # 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 98c5c06474e36..71824b15bbd99 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 02ea5504a0f93171f1a1ea14720ae802 +Signature: e9a2c0a84a597b33e1f49f60d2453641 UNUSED LICENSES: @@ -1317,6 +1317,7 @@ FILE: ../../../third_party/skia/src/sksl/analysis/BUILD.bazel FILE: ../../../third_party/skia/src/sksl/codegen/BUILD.bazel FILE: ../../../third_party/skia/src/sksl/dsl/BUILD.bazel FILE: ../../../third_party/skia/src/sksl/dsl/priv/BUILD.bazel +FILE: ../../../third_party/skia/src/sksl/generated/sksl_compute.dehydrated.sksl FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.dehydrated.sksl FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.dehydrated.sksl FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_frag.dehydrated.sksl @@ -1329,6 +1330,7 @@ FILE: ../../../third_party/skia/src/sksl/generated/sksl_vert.dehydrated.sksl FILE: ../../../third_party/skia/src/sksl/ir/BUILD.bazel FILE: ../../../third_party/skia/src/sksl/lex/BUILD.bazel FILE: ../../../third_party/skia/src/sksl/lex/sksl.lex +FILE: ../../../third_party/skia/src/sksl/sksl_compute.sksl FILE: ../../../third_party/skia/src/sksl/sksl_frag.sksl FILE: ../../../third_party/skia/src/sksl/sksl_gpu.sksl FILE: ../../../third_party/skia/src/sksl/sksl_graphite_frag.sksl @@ -1338,6 +1340,7 @@ FILE: ../../../third_party/skia/src/sksl/sksl_rt_shader.sksl FILE: ../../../third_party/skia/src/sksl/sksl_vert.sksl FILE: ../../../third_party/skia/src/sksl/tracing/BUILD.bazel FILE: ../../../third_party/skia/src/sksl/transform/BUILD.bazel +FILE: ../../../third_party/skia/src/text/BUILD.bazel FILE: ../../../third_party/skia/src/text/gpu/BUILD.bazel FILE: ../../../third_party/skia/src/utils/BUILD.bazel FILE: ../../../third_party/skia/src/xml/BUILD.bazel @@ -5957,6 +5960,7 @@ FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.cpp FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.h FILE: ../../../third_party/skia/src/gpu/tessellate/LinearTolerances.h FILE: ../../../third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp +FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetComputeShaderMainParams.cpp FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsSameExpressionTree.cpp FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsTrivialExpression.cpp FILE: ../../../third_party/skia/src/sksl/analysis/SkSLNoOpErrorReporter.h @@ -7492,12 +7496,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia -ORIGIN: ../../../third_party/skia/src/core/SkGlyphRun.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkGlyphRunPainter.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/src/core/SkGlyphRun.cpp -FILE: ../../../third_party/skia/src/core/SkGlyphRun.h FILE: ../../../third_party/skia/src/core/SkGlyphRunPainter.cpp FILE: ../../../third_party/skia/src/core/SkGlyphRunPainter.h +FILE: ../../../third_party/skia/src/text/GlyphRun.cpp +FILE: ../../../third_party/skia/src/text/GlyphRun.h ---------------------------------------------------------------------------------------------------- Copyright 2018 The Android Open Source Project