From dc2dff654d13ee343a5f7b9a15aa9a7880bbb87d Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Fri, 8 May 2020 01:36:25 +0000 Subject: [PATCH] Roll src/third_party/skia 0dc207f836da..a14084ba1b41 (3 commits) https://skia.googlesource.com/skia.git/+log/0dc207f836da..a14084ba1b41 git log 0dc207f836da..a14084ba1b41 --date=short --first-parent --format='%ad %ae %s' 2020-05-08 reed@google.com remove another bad assert 2020-05-08 reed@google.com fix assert 2020-05-07 reed@google.com Revert "Revert "custom typeface"" Created with: gclient setdep -r src/third_party/skia@a14084ba1b41 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 bsalomon@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/+/master/autoroll/README.md Bug: None Tbr: bsalomon@google.com --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index f3098e4fd4482..f49ca9f7976cd 100644 --- a/DEPS +++ b/DEPS @@ -26,7 +26,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': '0dc207f836daf9bcba3f39d7b6519c2960cbbf7e', + 'skia_revision': 'a14084ba1b411d3b85f3045d31b107281ceda665', # 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 d36d2abae6bf3..b38621bd7827e 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: d7c01d039a6521dd63bb395e4c6f6c6a +Signature: 3d8487c427c3cf3771c8417310023d9e UNUSED LICENSES: @@ -3891,11 +3891,13 @@ FILE: ../../../third_party/skia/bench/GrQuadBench.cpp FILE: ../../../third_party/skia/experimental/skottiekit/skottiekit_bindings.cpp FILE: ../../../third_party/skia/gm/crbug_1041204.cpp FILE: ../../../third_party/skia/gm/crbug_224618.cpp +FILE: ../../../third_party/skia/gm/userfont.cpp FILE: ../../../third_party/skia/include/gpu/d3d/GrD3DBackendContext.h FILE: ../../../third_party/skia/include/gpu/d3d/GrD3DTypes.h FILE: ../../../third_party/skia/include/gpu/d3d/GrD3DTypesMinimal.h FILE: ../../../third_party/skia/include/private/GrD3DTypesPriv.h FILE: ../../../third_party/skia/include/private/SkIDChangeListener.h +FILE: ../../../third_party/skia/include/utils/SkCustomTypeface.h FILE: ../../../third_party/skia/modules/canvaskit/viewer_bindings.cpp FILE: ../../../third_party/skia/src/core/SkIDChangeListener.cpp FILE: ../../../third_party/skia/src/core/SkMatrixProvider.h @@ -3951,6 +3953,7 @@ FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.cpp FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.h FILE: ../../../third_party/skia/src/sksl/SkSLSampleMatrix.cpp FILE: ../../../third_party/skia/src/sksl/SkSLSampleMatrix.h +FILE: ../../../third_party/skia/src/utils/SkCustomTypeface.cpp ---------------------------------------------------------------------------------------------------- Copyright 2020 Google LLC