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

Commit 3dfb90a

Browse files
authored
Update codec defines for Skia (#50554)
Skia is coalescing some defines related to codecs in https://skia-review.googlesource.com/c/skia/+/811816 This will let that change land (hopefully). ## Pre-launch Checklist - [X] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [X] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [X] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [ ] I listed at least one issue that this PR fixes in the description above. - [X] I added new tests to check the change I am making or feature I am adding, or the PR is [test-exempt]. See [testing the engine] for instructions on writing and running engine tests. - [X] I updated/added relevant documentation (doc comments with `///`). - [X] I signed the [CLA]. - [X] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat
1 parent 1c3ecee commit 3dfb90a

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

skia/BUILD.gn

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ if (is_fuchsia) {
1717
config("skia_public") {
1818
include_dirs = [ "$_skia_root" ]
1919

20-
defines = []
20+
defines = [
21+
"SK_CODEC_DECODES_BMP",
22+
"SK_CODEC_DECODES_WBMP",
23+
]
2124
cflags_objcc = []
2225
if (is_fuchsia || is_linux) {
2326
defines += [ "SK_R32_SHIFT=16" ]
@@ -534,7 +537,10 @@ optional("xps") {
534537

535538
optional("png_decode") {
536539
enabled = skia_use_libpng_decode
537-
public_defines = [ "SK_CODEC_DECODES_PNG" ]
540+
public_defines = [
541+
"SK_CODEC_DECODES_PNG",
542+
"SK_CODEC_DECODES_ICO",
543+
]
538544

539545
deps = [ "//third_party/libpng" ]
540546
sources = [
@@ -581,7 +587,11 @@ optional("webp_encode") {
581587

582588
optional("wuffs") {
583589
enabled = skia_use_wuffs
584-
public_defines = [ "SK_HAS_WUFFS_LIBRARY" ]
590+
public_defines = [
591+
"SK_HAS_WUFFS_LIBRARY", # TODO remove after rolling
592+
# http://review.skia.org/811816
593+
"SK_CODEC_DECODES_GIF",
594+
]
585595

586596
deps = [ "//flutter/third_party/wuffs" ]
587597
sources = [ "$_skia_root/src/codec/SkWuffsCodec.cpp" ]

0 commit comments

Comments
 (0)