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

Roll Skia from 5abf9717ea92 to 31f275e8fcc7 (8 revisions) #49850

Merged
auto-submit merged 1 commit into from
Jan 18, 2024
Merged

Roll Skia from 5abf9717ea92 to 31f275e8fcc7 (8 revisions) #49850

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 @@ -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.
Expand Down
25 changes: 4 additions & 21 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: be9b38c7de8cb8844b094cebc5661b54
Signature: 65a1b0b7c1c33ad3a3bf1a93261ba8c7

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down