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

Commit 232042d

Browse files
skia-flutter-autorollskia-flutter-autoroll
committed
Roll Skia from 5758d9c344e3 to 6e0c0a255166 (3 revisions)
https://skia.googlesource.com/skia.git/+log/5758d9c344e3..6e0c0a255166 2024-10-29 jlavrova@google.com Reland "Adding Fontations to FontConfig manager" 2024-10-29 bungeman@google.com [pdf] Expand content item scope 2024-10-29 jamesgk@google.com [graphite] Simplify ShaderInfo API 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,chinmaygarde@google.com,jamesgk@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
1 parent 795b549 commit 232042d

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

‎DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': '5758d9c344e3752134748866b091c2136c1a57bd',
17+
'skia_revision': '6e0c0a255166d1cc4f1738d54dba1cc189f904b1',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

‎ci/licenses_golden/licenses_skia

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 152f9a0f54c7024762bc2e3c87cd4b6f
1+
Signature: f877d04be9ba846b33a28f123f16bc2d
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -9416,7 +9416,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
94169416

94179417
====================================================================================================
94189418
LIBRARY: skia
9419+
ORIGIN: ../../../flutter/third_party/skia/include/core/SkFontScanner.h + ../../../flutter/third_party/skia/LICENSE
94199420
ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_Fontations.h + ../../../flutter/third_party/skia/LICENSE
9421+
ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontScanner_Fontations.h + ../../../flutter/third_party/skia/LICENSE
9422+
ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontScanner_FreeType.h + ../../../flutter/third_party/skia/LICENSE
94209423
ORIGIN: ../../../flutter/third_party/skia/modules/skottie/utils/PreshapeTool.cpp + ../../../flutter/third_party/skia/LICENSE
94219424
ORIGIN: ../../../flutter/third_party/skia/modules/skottie/utils/TextPreshape.cpp + ../../../flutter/third_party/skia/LICENSE
94229425
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 + ../.
94299432
ORIGIN: ../../../flutter/third_party/skia/src/codec/SkCrabbyAvifCodec.h + ../../../flutter/third_party/skia/LICENSE
94309433
ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.cpp + ../../../flutter/third_party/skia/LICENSE
94319434
ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.h + ../../../flutter/third_party/skia/LICENSE
9432-
ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontScanner.h + ../../../flutter/third_party/skia/LICENSE
94339435
ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/win/GrGLMakeWinInterface.cpp + ../../../flutter/third_party/skia/LICENSE
94349436
ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp + ../../../flutter/third_party/skia/LICENSE
94359437
ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.cpp + ../../../flutter/third_party/skia/LICENSE
9438+
ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_FreeType_priv.h + ../../../flutter/third_party/skia/LICENSE
94369439
ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_sbix.h + ../../../flutter/third_party/skia/LICENSE
94379440
TYPE: LicenseType.bsd
9441+
FILE: ../../../flutter/third_party/skia/include/core/SkFontScanner.h
94389442
FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_Fontations.h
9443+
FILE: ../../../flutter/third_party/skia/include/ports/SkFontScanner_Fontations.h
9444+
FILE: ../../../flutter/third_party/skia/include/ports/SkFontScanner_FreeType.h
94399445
FILE: ../../../flutter/third_party/skia/modules/skottie/utils/PreshapeTool.cpp
94409446
FILE: ../../../flutter/third_party/skia/modules/skottie/utils/TextPreshape.cpp
94419447
FILE: ../../../flutter/third_party/skia/modules/skottie/utils/TextPreshape.h
@@ -9448,10 +9454,10 @@ FILE: ../../../flutter/third_party/skia/src/codec/SkCrabbyAvifCodec.cpp
94489454
FILE: ../../../flutter/third_party/skia/src/codec/SkCrabbyAvifCodec.h
94499455
FILE: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.cpp
94509456
FILE: ../../../flutter/third_party/skia/src/codec/SkJpegMetadataDecoderImpl.h
9451-
FILE: ../../../flutter/third_party/skia/src/core/SkFontScanner.h
94529457
FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/win/GrGLMakeWinInterface.cpp
94539458
FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp
94549459
FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.cpp
9460+
FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_FreeType_priv.h
94559461
FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_sbix.h
94569462
----------------------------------------------------------------------------------------------------
94579463
Copyright 2024 Google Inc.
@@ -9551,6 +9557,8 @@ ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RenderPassDesc.cpp +
95519557
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RenderPassDesc.h + ../../../flutter/third_party/skia/LICENSE
95529558
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ScratchResourceManager.cpp + ../../../flutter/third_party/skia/LICENSE
95539559
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ScratchResourceManager.h + ../../../flutter/third_party/skia/LICENSE
9560+
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ShaderInfo.cpp + ../../../flutter/third_party/skia/LICENSE
9561+
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ShaderInfo.h + ../../../flutter/third_party/skia/LICENSE
95549562
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/TextureInfoPriv.h + ../../../flutter/third_party/skia/LICENSE
95559563
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnBackendTexture.cpp + ../../../flutter/third_party/skia/LICENSE
95569564
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnTextureInfo.cpp + ../../../flutter/third_party/skia/LICENSE
@@ -9670,6 +9678,8 @@ FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RenderPassDesc.cpp
96709678
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RenderPassDesc.h
96719679
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ScratchResourceManager.cpp
96729680
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ScratchResourceManager.h
9681+
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ShaderInfo.cpp
9682+
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ShaderInfo.h
96739683
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/TextureInfoPriv.h
96749684
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnBackendTexture.cpp
96759685
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnTextureInfo.cpp
@@ -9806,10 +9816,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
98069816
====================================================================================================
98079817
LIBRARY: skia
98089818
ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.cpp + ../../../flutter/third_party/skia/LICENSE
9809-
ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.h + ../../../flutter/third_party/skia/LICENSE
9819+
ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations_priv.h + ../../../flutter/third_party/skia/LICENSE
98109820
TYPE: LicenseType.bsd
98119821
FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.cpp
9812-
FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.h
9822+
FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations_priv.h
98139823
----------------------------------------------------------------------------------------------------
98149824
Copyright 2024 The Android Open Source Project
98159825

0 commit comments

Comments
 (0)