Skip to content

Commit 4b87db5

Browse files
authored
Roll Skia to 14f8f6d984ff (flutter/engine#57068)
Resolves flutter/engine#57068. Set args `skia_use_libpng_decode=true` and `skia_use_rust_png_decode=false`. https://skia.googlesource.com/skia.git/+log/e78dd0265002..14f8f6d984ff 2024-12-09 kjlubick@google.com Update GN build to allow for rust PNG decoding only 2024-12-09 lukasza@chromium.org [rust png] Update Skia => `png` dependency to version 0.17.15. 2024-12-09 kjlubick@google.com Add placeholder files for jsonreader
1 parent f3c1d7b commit 4b87db5

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
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': 'e78dd02650024d7f0e4d8cb73e3b6657b19b0317',
17+
'skia_revision': '14f8f6d984ff23bed1f9ae7acf98be683eccaeac',
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.

engine/src/flutter/ci/licenses_golden/excluded_files

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2805,6 +2805,7 @@
28052805
../../../flutter/third_party/skia/modules/canvaskit/wasm_tools/SIMD/.gitignore
28062806
../../../flutter/third_party/skia/modules/jetski/BUILD.bazel
28072807
../../../flutter/third_party/skia/modules/jetski/README
2808+
../../../flutter/third_party/skia/modules/jsonreader/BUILD.bazel
28082809
../../../flutter/third_party/skia/modules/pathkit/.gitignore
28092810
../../../flutter/third_party/skia/modules/pathkit/BUILD.bazel
28102811
../../../flutter/third_party/skia/modules/pathkit/CHANGELOG.md

engine/src/flutter/ci/licenses_golden/licenses_skia

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: a4491fcc5578e3c1714db99d545cc295
1+
Signature: 46741797d10275489df2fe44716fd9a1
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -9528,6 +9528,7 @@ ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/Precom
95289528
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileMaskFilter.h + ../../../flutter/third_party/skia/LICENSE
95299529
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileRuntimeEffect.h + ../../../flutter/third_party/skia/LICENSE
95309530
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileShader.h + ../../../flutter/third_party/skia/LICENSE
9531+
ORIGIN: ../../../flutter/third_party/skia/modules/jsonreader/SkJSONReader.h + ../../../flutter/third_party/skia/LICENSE
95319532
ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_coretext.h + ../../../flutter/third_party/skia/LICENSE
95329533
ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_factory.h + ../../../flutter/third_party/skia/LICENSE
95339534
ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_harfbuzz.h + ../../../flutter/third_party/skia/LICENSE
@@ -9655,6 +9656,7 @@ FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/Precompi
96559656
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileMaskFilter.h
96569657
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileRuntimeEffect.h
96579658
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileShader.h
9659+
FILE: ../../../flutter/third_party/skia/modules/jsonreader/SkJSONReader.h
96589660
FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_coretext.h
96599661
FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_factory.h
96609662
FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_harfbuzz.h

engine/src/flutter/skia/BUILD.gn

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@ optional("jpeg_decode") {
514514

515515
optional("jpeg_encode") {
516516
enabled = skia_use_libjpeg_turbo_encode && !skia_use_ndk_images
517+
public_defines = [ "SK_CODEC_ENCODES_JPEG" ]
517518

518519
deps = [ "//flutter/third_party/libjpeg-turbo:libjpeg" ]
519520
public = skia_encode_jpeg_public
@@ -538,22 +539,27 @@ optional("xps") {
538539
sources = skia_xps_sources
539540
}
540541

541-
optional("png_decode") {
542+
optional("png_decode_libpng") {
542543
enabled = skia_use_libpng_decode
543544
public_defines = [
544545
"SK_CODEC_DECODES_PNG",
545546
"SK_CODEC_DECODES_ICO",
547+
"SK_CODEC_DECODES_PNG_WITH_LIBPNG",
546548
]
547549

548550
deps = [ "//flutter/third_party/libpng" ]
549-
sources = [ "$_skia_root/src/codec/SkIcoCodec.cpp" ]
550-
sources += skia_codec_png
551+
sources = [ "$_skia_root/src/codec/SkIcoCodec.cpp" ] + skia_codec_png_base +
552+
skia_codec_libpng_srcs
551553
}
552554

553555
optional("png_encode") {
554556
enabled = skia_use_libpng_encode && !skia_use_ndk_images
555-
public = skia_encode_png_public
557+
public_defines = [
558+
"SK_CODEC_ENCODES_PNG",
559+
"SK_CODEC_ENCODES_PNG_WITH_LIBPNG",
560+
]
556561

562+
public = skia_encode_png_public
557563
deps = [ "//flutter/third_party/libpng" ]
558564
sources = skia_encode_png_srcs
559565
}
@@ -576,6 +582,7 @@ optional("webp_decode") {
576582

577583
optional("webp_encode") {
578584
enabled = skia_use_libwebp_encode && !skia_use_ndk_images
585+
public_defines = [ "SK_CODEC_ENCODES_WEBP" ]
579586
public = skia_encode_webp_public
580587

581588
deps = [ "//flutter/third_party/libwebp" ]
@@ -634,7 +641,7 @@ skia_component("skia") {
634641
":hsw",
635642
":jpeg_decode",
636643
":ndk_images",
637-
":png_decode",
644+
":png_decode_libpng",
638645
":webp_decode",
639646
":wuffs",
640647
":xml",

engine/src/flutter/tools/gn

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,10 @@ def to_gn_args(args):
434434
gn_args['enable_unittests'] = False
435435

436436
# Skia GN args.
437+
gn_args['skia_use_libpng_decode'] = True
438+
gn_args['skia_use_libpng_encode'] = True
439+
gn_args['skia_use_rust_png_decode'] = False
440+
gn_args['skia_use_rust_png_encode'] = False
437441
gn_args['skia_use_dng_sdk'] = False # RAW image handling.
438442
gn_args['skia_enable_pdf'] = False # PDF handling.
439443
gn_args['skia_use_x11'] = False # Never add the X11 dependency (only takes effect on Linux).

0 commit comments

Comments
 (0)