From c9bce2252196eab5c41ae1b5ddde769a796c04ba Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Thu, 18 Jan 2024 00:52:01 +0000 Subject: [PATCH] Roll Skia from 5abf9717ea92 to 31f275e8fcc7 (8 revisions) https://skia.googlesource.com/skia.git/+log/5abf9717ea92..31f275e8fcc7 2024-01-18 mike@reedtribe.org Simplify SkFontHost_FreeType_common.h 2024-01-17 johnstiles@google.com Convert ForLoopMultipleInit into a runnable test. 2024-01-17 johnstiles@google.com Use a Block to hold the body of a switch statement. 2024-01-17 herb@google.com Remove segment list pre-processing 2024-01-17 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 5803e963cb95 to afab4ff4f0df (4 revisions) 2024-01-17 herb@google.com Improve fuzzability for slug stream 2024-01-17 kjlubick@google.com Reland "Remove SkFontMgr::RefDefault() and dependent APIs" 2024-01-17 johnstiles@google.com Minor simplifications in Parser token handling. 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,jlavrova@google.com,jonahwilliams@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 | 25 ++++--------------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/DEPS b/DEPS index fd8a400121d0f..2298092ce3211 100644 --- a/DEPS +++ b/DEPS @@ -17,7 +17,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': '5abf9717ea926663f2eccce6617065751326ba89', + 'skia_revision': '31f275e8fcc7af7350f8c86cda3d12b875eb8508', # 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 9cdeb6a66dfe5..69620ecaaa3a5 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: be9b38c7de8cb8844b094cebc5661b54 +Signature: 65a1b0b7c1c33ad3a3bf1a93261ba8c7 ==================================================================================================== LIBRARY: etc1 @@ -392,6 +392,7 @@ FILE: ../../../flutter/third_party/skia/relnotes/SwitchScopes.md FILE: ../../../flutter/third_party/skia/relnotes/Tick.md FILE: ../../../flutter/third_party/skia/relnotes/TopLevelShadowing.md FILE: ../../../flutter/third_party/skia/relnotes/font.md +FILE: ../../../flutter/third_party/skia/relnotes/fontmgr.md FILE: ../../../flutter/third_party/skia/relnotes/skfontarguments_type.md FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml @@ -942,9 +943,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LIBRARY: skia ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontHost_FreeType_common.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/ports/SkTypeface_FreeType.h + ../../../flutter/third_party/skia/LICENSE TYPE: LicenseType.bsd FILE: ../../../flutter/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp FILE: ../../../flutter/third_party/skia/src/ports/SkFontHost_FreeType_common.h +FILE: ../../../flutter/third_party/skia/src/ports/SkTypeface_FreeType.h ---------------------------------------------------------------------------------------------------- Copyright 2006-2012 The Android Open Source Project Copyright 2012 Mozilla Foundation @@ -1030,10 +1033,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_FontConfigInterface_factory.cpp + ../../../flutter/third_party/skia/LICENSE TYPE: LicenseType.bsd FILE: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp -FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_FontConfigInterface_factory.cpp ---------------------------------------------------------------------------------------------------- Copyright 2008 Google Inc. @@ -1081,7 +1082,6 @@ ORIGIN: ../../../flutter/third_party/skia/src/core/SkPoint.cpp + ../../../flutte ORIGIN: ../../../flutter/third_party/skia/src/core/SkPtrRecorder.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/core/SkStroke.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/core/SkWriter32.h + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_empty_factory.cpp + ../../../flutter/third_party/skia/LICENSE TYPE: LicenseType.bsd FILE: ../../../flutter/third_party/skia/include/core/SkMallocPixelRef.h FILE: ../../../flutter/third_party/skia/include/core/SkPixelRef.h @@ -1096,7 +1096,6 @@ FILE: ../../../flutter/third_party/skia/src/core/SkPoint.cpp FILE: ../../../flutter/third_party/skia/src/core/SkPtrRecorder.h FILE: ../../../flutter/third_party/skia/src/core/SkStroke.cpp FILE: ../../../flutter/third_party/skia/src/core/SkWriter32.h -FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_empty_factory.cpp ---------------------------------------------------------------------------------------------------- Copyright 2008 The Android Open Source Project @@ -3318,11 +3317,6 @@ ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFBitmap.cpp + ../../../flu ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFBitmap.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFMetadata.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFMetadata.h + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_android_factory.cpp + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_directory_factory.cpp + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_embedded_factory.cpp + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontconfig_factory.cpp + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_win_dw_factory.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkOSLibrary.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkOSLibrary_posix.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkOSLibrary_win.cpp + ../../../flutter/third_party/skia/LICENSE @@ -3604,11 +3598,6 @@ FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFBitmap.cpp FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFBitmap.h FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFMetadata.cpp FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFMetadata.h -FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_android_factory.cpp -FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_directory_factory.cpp -FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_embedded_factory.cpp -FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontconfig_factory.cpp -FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_win_dw_factory.cpp FILE: ../../../flutter/third_party/skia/src/ports/SkOSLibrary.h FILE: ../../../flutter/third_party/skia/src/ports/SkOSLibrary_posix.cpp FILE: ../../../flutter/third_party/skia/src/ports/SkOSLibrary_win.cpp @@ -3976,7 +3965,6 @@ ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.c ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeToUnicodeCmap.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontConfigInterface.cpp + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkImageGeneratorCG.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkImageGeneratorWIC.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkColorFilterShader.h + ../../../flutter/third_party/skia/LICENSE @@ -4281,7 +4269,6 @@ FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.cpp FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.h FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeToUnicodeCmap.h FILE: ../../../flutter/third_party/skia/src/ports/SkFontConfigInterface.cpp -FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp FILE: ../../../flutter/third_party/skia/src/ports/SkImageGeneratorCG.cpp FILE: ../../../flutter/third_party/skia/src/ports/SkImageGeneratorWIC.cpp FILE: ../../../flutter/third_party/skia/src/shaders/SkColorFilterShader.h @@ -4604,7 +4591,6 @@ ORIGIN: ../../../flutter/third_party/skia/src/core/SkDrawShadowInfo.cpp + ../../ ORIGIN: ../../../flutter/third_party/skia/src/core/SkDrawShadowInfo.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/core/SkDraw_vertices.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/core/SkExecutor.cpp + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontMgrPriv.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/core/SkGaussFilter.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/core/SkGaussFilter.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/core/SkImageInfoPriv.h + ../../../flutter/third_party/skia/LICENSE @@ -4679,7 +4665,6 @@ ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFGradientShader.h + ../../ ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_directory.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_embedded.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_empty.cpp + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_mac_ct_factory.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkOSFile_ios.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_fvar.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkShaderBase.h + ../../../flutter/third_party/skia/LICENSE @@ -4825,7 +4810,6 @@ FILE: ../../../flutter/third_party/skia/src/core/SkDrawShadowInfo.cpp FILE: ../../../flutter/third_party/skia/src/core/SkDrawShadowInfo.h FILE: ../../../flutter/third_party/skia/src/core/SkDraw_vertices.cpp FILE: ../../../flutter/third_party/skia/src/core/SkExecutor.cpp -FILE: ../../../flutter/third_party/skia/src/core/SkFontMgrPriv.h FILE: ../../../flutter/third_party/skia/src/core/SkGaussFilter.cpp FILE: ../../../flutter/third_party/skia/src/core/SkGaussFilter.h FILE: ../../../flutter/third_party/skia/src/core/SkImageInfoPriv.h @@ -4900,7 +4884,6 @@ FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFGradientShader.h FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_directory.cpp FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_embedded.cpp FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_empty.cpp -FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_mac_ct_factory.cpp FILE: ../../../flutter/third_party/skia/src/ports/SkOSFile_ios.h FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_fvar.h FILE: ../../../flutter/third_party/skia/src/shaders/SkShaderBase.h