From 378d31773374dbf89c704a5586fdfe73c18be1f9 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Fri, 13 Oct 2023 20:48:00 +0000 Subject: [PATCH] Roll Skia from c9601553b0f3 to 4bc4b4d22866 (1 revision) https://skia.googlesource.com/skia.git/+log/c9601553b0f3..4bc4b4d22866 2023-10-13 kjlubick@google.com Revert "Remove GL dependency from GrBackendSemaphore" 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,johnstiles@google.com,jsimmons@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 +- ci/licenses_golden/licenses_skia | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 0a1b4f89da130..ba89aa6211db7 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': 'c9601553b0f3ab5dd8d927a9bb4d1733658dc330', + 'skia_revision': '4bc4b4d22866616bd8828cb3a710c68b5a9ade3c', # 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 3f7d7ac7e47f8..7a54c07e3d897 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 28f383fcaaeed0b622866e66961b4fcd +Signature: dd77b9ddc2162fc585c3fdb6ebb810f8 ==================================================================================================== LIBRARY: etc1 @@ -387,7 +387,6 @@ FILE: ../../../third_party/skia/modules/pathkit/perf/perfReporter.js FILE: ../../../third_party/skia/modules/skparagraph/test.html FILE: ../../../third_party/skia/package-lock.json FILE: ../../../third_party/skia/relnotes/base64.md -FILE: ../../../third_party/skia/relnotes/glbackendsemaphore.md FILE: ../../../third_party/skia/relnotes/grsurface-info.md FILE: ../../../third_party/skia/relnotes/mesh.md FILE: ../../../third_party/skia/relnotes/readbuffer-deserial.md @@ -8856,7 +8855,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/PipelineUtils.h + ../../../third_party ORIGIN: ../../../third_party/skia/src/gpu/TiledTextureUtils.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/TiledTextureUtils.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/GrBackendSemaphorePriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrBackendSurfacePriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrCanvas.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrCanvas.h + ../../../third_party/skia/LICENSE @@ -9121,7 +9119,6 @@ FILE: ../../../third_party/skia/src/gpu/PipelineUtils.h FILE: ../../../third_party/skia/src/gpu/TiledTextureUtils.cpp FILE: ../../../third_party/skia/src/gpu/TiledTextureUtils.h FILE: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h -FILE: ../../../third_party/skia/src/gpu/ganesh/GrBackendSemaphorePriv.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrBackendSurfacePriv.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrCanvas.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/GrCanvas.h