From d78ab8ae470d4a20031e73a85ffd27a9c50cdb24 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Wed, 12 Jan 2022 18:52:45 +0000 Subject: [PATCH] Roll Skia from 44c00ae64a4e to 04e74196b022 (1 revision) https://skia.googlesource.com/skia.git/+log/44c00ae64a4e..04e74196b022 2022-01-12 robertphillips@google.com [graphite] Replace Combination with SkPaintParamsKey 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 kaushikiska@google.com,michaelludwig@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 | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 38b9d49a7195d..9fa4181769289 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': '44c00ae64a4e3eb2ff815f3817e6f319d18c55cc', + 'skia_revision': '04e74196b022694cc5d4830b328f9fc5dea81991', # 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 800b4a9f87f94..1632f95a41a51 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: f1b47b74d5d1648436d75fea98a98c23 +Signature: 40f3e0ecae1e3cf77ce17b175961e02c UNUSED LICENSES: @@ -6013,6 +6013,10 @@ FILE: ../../../third_party/skia/experimental/graphite/src/ShaderCodeDictionary.c FILE: ../../../third_party/skia/experimental/graphite/src/ShaderCodeDictionary.h FILE: ../../../third_party/skia/experimental/graphite/src/UniquePaintParamsID.h FILE: ../../../third_party/skia/src/core/SkDebugUtils.h +FILE: ../../../third_party/skia/src/core/SkKeyHelpers.cpp +FILE: ../../../third_party/skia/src/core/SkKeyHelpers.h +FILE: ../../../third_party/skia/src/core/SkPaintParamsKey.cpp +FILE: ../../../third_party/skia/src/core/SkPaintParamsKey.h ---------------------------------------------------------------------------------------------------- Copyright 2022 Google LLC