diff --git a/DEPS b/DEPS index 1aa95427d7914..dd372d89a57ea 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ vars = { 'flutter_git': 'https://flutter.googlesource.com', 'skia_git': 'https://skia.googlesource.com', 'llvm_git': 'https://llvm.googlesource.com', - 'skia_revision': 'f334411b0a08fdf2f78be2a730676466e2bcc869', + 'skia_revision': '85b77db25fa3e2bc5b92c2921902f5f2f24acf9b', # 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 acc4dba4d4615..6e04dad369b06 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 9a57a87964b213843e12474580f35514 +Signature: 1724e90c01c9a0c2df8c226f8aca5d48 ==================================================================================================== LIBRARY: etc1 @@ -9416,7 +9416,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia +ORIGIN: ../../../flutter/third_party/skia/include/core/SkFontScanner.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_Fontations.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontScanner_Fontations.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontScanner_FreeType.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/skottie/utils/PreshapeTool.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/skottie/utils/TextPreshape.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/modules/skottie/utils/TextPreshape.h + ../../../flutter/third_party/skia/LICENSE @@ -9429,13 +9432,16 @@ ORIGIN: ../../../flutter/third_party/skia/src/codec/SkCrabbyAvifCodec.cpp + ../. ORIGIN: ../../../flutter/third_party/skia/src/codec/SkCrabbyAvifCodec.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.h + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontScanner.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/win/GrGLMakeWinInterface.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.cpp + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_FreeType_priv.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_sbix.h + ../../../flutter/third_party/skia/LICENSE TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/skia/include/core/SkFontScanner.h FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_Fontations.h +FILE: ../../../flutter/third_party/skia/include/ports/SkFontScanner_Fontations.h +FILE: ../../../flutter/third_party/skia/include/ports/SkFontScanner_FreeType.h FILE: ../../../flutter/third_party/skia/modules/skottie/utils/PreshapeTool.cpp FILE: ../../../flutter/third_party/skia/modules/skottie/utils/TextPreshape.cpp FILE: ../../../flutter/third_party/skia/modules/skottie/utils/TextPreshape.h @@ -9448,10 +9454,10 @@ FILE: ../../../flutter/third_party/skia/src/codec/SkCrabbyAvifCodec.cpp FILE: ../../../flutter/third_party/skia/src/codec/SkCrabbyAvifCodec.h FILE: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.cpp FILE: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.h -FILE: ../../../flutter/third_party/skia/src/core/SkFontScanner.h FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/win/GrGLMakeWinInterface.cpp FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.cpp +FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_FreeType_priv.h FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_sbix.h ---------------------------------------------------------------------------------------------------- Copyright 2024 Google Inc. @@ -9810,10 +9816,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.cpp + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations_priv.h + ../../../flutter/third_party/skia/LICENSE TYPE: LicenseType.bsd FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.cpp -FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.h +FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations_priv.h ---------------------------------------------------------------------------------------------------- Copyright 2024 The Android Open Source Project