Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Roll Skia from 6e0c0a255166 to 7385b2d99fe9 (5 revisions) #56222

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Roll Skia from 6e0c0a255166 to 7385b2d99fe9 (5 revisions) #56222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': '6e0c0a255166d1cc4f1738d54dba1cc189f904b1',
'skia_revision': '7385b2d99fe913e33781e0abb67b5e751944194f',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down
16 changes: 5 additions & 11 deletions ci/licenses_golden/licenses_skia
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: f877d04be9ba846b33a28f123f16bc2d
Signature: b88bfcf32c741925c5824b2644e96417

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -9416,10 +9416,7 @@ 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
Expand All @@ -9432,16 +9429,13 @@ 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
Expand All @@ -9454,10 +9448,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.
Expand Down Expand Up @@ -9816,10 +9810,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_priv.h + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.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_priv.h
FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.h
----------------------------------------------------------------------------------------------------
Copyright 2024 The Android Open Source Project

Expand Down