From 184d26fcd6c1f574d27b9ba53bfa73481d8d1113 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Wed, 10 Feb 2021 12:30:01 +0000 Subject: [PATCH] Roll Skia from 7f942e46fda2 to 9e2c50edaaac (1 revision) https://skia.googlesource.com/skia.git/+log/7f942e46fda2..9e2c50edaaac 2021-02-10 adlai@google.com Revert "Remove deferred proxy machinery" 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 borenet@google.com on the revert to ensure that a human is aware of the problem. 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/master/autoroll/README.md --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 6f86e3f5ef2bf..3a5d3d6b8e952 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': '7f942e46fda2b45a095a15e372b51b1dadb41560', + 'skia_revision': '9e2c50edaaac25c048a288db7820a72182af51bb', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 247f2e8c97b4f..11a34eaf873a2 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 378827aef856a18a0bc96a4df7f1bd97 +Signature: f9eafb667daff07d5d99434cb7ab24dd UNUSED LICENSES: @@ -3475,6 +3475,7 @@ FILE: ../../../third_party/skia/src/gpu/GrBackendTextureImageGenerator.cpp FILE: ../../../third_party/skia/src/gpu/GrBackendTextureImageGenerator.h FILE: ../../../third_party/skia/src/gpu/GrColorInfo.cpp FILE: ../../../third_party/skia/src/gpu/GrColorInfo.h +FILE: ../../../third_party/skia/src/gpu/GrDeferredProxyUploader.h FILE: ../../../third_party/skia/src/gpu/GrDeferredUpload.h FILE: ../../../third_party/skia/src/gpu/GrOnFlushResourceProvider.cpp FILE: ../../../third_party/skia/src/gpu/GrOnFlushResourceProvider.h @@ -3486,6 +3487,7 @@ FILE: ../../../third_party/skia/src/gpu/GrSemaphore.h FILE: ../../../third_party/skia/src/gpu/GrStencilClip.h FILE: ../../../third_party/skia/src/gpu/GrSurfaceProxyPriv.h FILE: ../../../third_party/skia/src/gpu/GrTextureProxyCacheAccess.h +FILE: ../../../third_party/skia/src/gpu/GrTextureProxyPriv.h FILE: ../../../third_party/skia/src/gpu/SkGr.h FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCAtlas.cpp FILE: ../../../third_party/skia/src/gpu/ccpr/GrCCAtlas.h