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

Commit fed4b79

Browse files
committed
Re-enable the Wuffs GIF decoder
Fixes flutter/flutter#23838
1 parent f600ae8 commit fed4b79

File tree

6 files changed

+39
-569
lines changed

6 files changed

+39
-569
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ deps = {
390390
Var('chromium_git') + '/webm/libwebp.git' + '@' + '0.6.0',
391391

392392
'src/third_party/wuffs':
393-
Var('fuchsia_git') + '/third_party/wuffs' + '@' + 'a71538baa8f1f4053176c0d9f31bc12fd4e8e71b',
393+
Var('fuchsia_git') + '/third_party/wuffs' + '@' + '11de618a6717c5c5d8c444b9c5ddf38d966b851d',
394394

395395
'src/third_party/fontconfig/src':
396396
Var('chromium_git') + '/external/fontconfig.git' + '@' + 'c336b8471877371f0190ba06f7547c54e2b890ba',

ci/licenses_golden/licenses_skia

Lines changed: 2 additions & 545 deletions
Large diffs are not rendered by default.

ci/licenses_golden/licenses_third_party

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 867dd399b0f19bf93a3ed95b59498779
1+
Signature: ccd483c87594ed0c5e461273b748f428
22

33
UNUSED LICENSES:
44

@@ -517,27 +517,6 @@ FILE: ../../../third_party/vulkan/include/vulkan/vulkan_xlib.h
517517
FILE: ../../../third_party/vulkan/include/vulkan/vulkan_xlib_xrandr.h
518518
FILE: ../../../third_party/wuffs/cmd/commonflags/commonflags.go
519519
FILE: ../../../third_party/wuffs/cmd/wuffs-c/genlib.go
520-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/all-impl.c
521-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/core-private.h
522-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/core-public.h
523-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/image-impl.c
524-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/image-private.h
525-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/image-public.h
526-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/io-private.h
527-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/io-public.h
528-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/memory-private.h
529-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/memory-public.h
530-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/range-private.h
531-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/range-public.h
532-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/builtin.go
533-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/cgen.go
534-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/data.go
535-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/expr.go
536-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/func.go
537-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/gen.go
538-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/resume.go
539-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/statement.go
540-
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/var.go
541520
FILE: ../../../third_party/wuffs/cmd/wuffs-c/main.go
542521
FILE: ../../../third_party/wuffs/cmd/wuffs-c/release.go
543522
FILE: ../../../third_party/wuffs/cmd/wuffs-c/test.go
@@ -553,6 +532,28 @@ FILE: ../../../third_party/wuffs/example/zcat/zcat.c
553532
FILE: ../../../third_party/wuffs/fuzz/c/fuzzlib/fuzzlib.c
554533
FILE: ../../../third_party/wuffs/fuzz/c/std/gif_fuzzer.c
555534
FILE: ../../../third_party/wuffs/fuzz/c/std/zlib_fuzzer.c
535+
FILE: ../../../third_party/wuffs/internal/cgen/base/all-impl.c
536+
FILE: ../../../third_party/wuffs/internal/cgen/base/core-private.h
537+
FILE: ../../../third_party/wuffs/internal/cgen/base/core-public.h
538+
FILE: ../../../third_party/wuffs/internal/cgen/base/image-impl.c
539+
FILE: ../../../third_party/wuffs/internal/cgen/base/image-private.h
540+
FILE: ../../../third_party/wuffs/internal/cgen/base/image-public.h
541+
FILE: ../../../third_party/wuffs/internal/cgen/base/io-private.h
542+
FILE: ../../../third_party/wuffs/internal/cgen/base/io-public.h
543+
FILE: ../../../third_party/wuffs/internal/cgen/base/memory-private.h
544+
FILE: ../../../third_party/wuffs/internal/cgen/base/memory-public.h
545+
FILE: ../../../third_party/wuffs/internal/cgen/base/range-private.h
546+
FILE: ../../../third_party/wuffs/internal/cgen/base/range-public.h
547+
FILE: ../../../third_party/wuffs/internal/cgen/builtin.go
548+
FILE: ../../../third_party/wuffs/internal/cgen/cgen.go
549+
FILE: ../../../third_party/wuffs/internal/cgen/data.go
550+
FILE: ../../../third_party/wuffs/internal/cgen/expr.go
551+
FILE: ../../../third_party/wuffs/internal/cgen/func.go
552+
FILE: ../../../third_party/wuffs/internal/cgen/gen.go
553+
FILE: ../../../third_party/wuffs/internal/cgen/resume.go
554+
FILE: ../../../third_party/wuffs/internal/cgen/statement.go
555+
FILE: ../../../third_party/wuffs/internal/cgen/var.go
556+
FILE: ../../../third_party/wuffs/internal/testcut/testcut.go
556557
FILE: ../../../third_party/wuffs/lang/ast/ast.go
557558
FILE: ../../../third_party/wuffs/lang/ast/eq.go
558559
FILE: ../../../third_party/wuffs/lang/ast/sort.go
@@ -576,9 +577,17 @@ FILE: ../../../third_party/wuffs/lang/token/token.go
576577
FILE: ../../../third_party/wuffs/lang/wuffsroot/wuffsroot.go
577578
FILE: ../../../third_party/wuffs/lib/base38/base38.go
578579
FILE: ../../../third_party/wuffs/lib/base38/base38_test.go
580+
FILE: ../../../third_party/wuffs/lib/flatecut/flatecut.go
581+
FILE: ../../../third_party/wuffs/lib/flatecut/flatecut_test.go
579582
FILE: ../../../third_party/wuffs/lib/interval/interval.go
580583
FILE: ../../../third_party/wuffs/lib/interval/interval_test.go
581584
FILE: ../../../third_party/wuffs/lib/interval/radial_test.go
585+
FILE: ../../../third_party/wuffs/lib/rac/example_test.go
586+
FILE: ../../../third_party/wuffs/lib/rac/rac.go
587+
FILE: ../../../third_party/wuffs/lib/rac/writer.go
588+
FILE: ../../../third_party/wuffs/lib/rac/writer_test.go
589+
FILE: ../../../third_party/wuffs/lib/zlibcut/zlibcut.go
590+
FILE: ../../../third_party/wuffs/lib/zlibcut/zlibcut_test.go
582591
FILE: ../../../third_party/wuffs/release/c/wuffs-unsupported-snapshot.c
583592
FILE: ../../../third_party/wuffs/release/c/wuffs-v0.2.c
584593
FILE: ../../../third_party/wuffs/script/adler32-standalone.c
@@ -594,6 +603,7 @@ FILE: ../../../third_party/wuffs/script/extract-giflzw.go
594603
FILE: ../../../third_party/wuffs/script/extract-palette-indexes.go
595604
FILE: ../../../third_party/wuffs/script/inline-c-relative-includes.go
596605
FILE: ../../../third_party/wuffs/script/make-artificial.go
606+
FILE: ../../../third_party/wuffs/script/mmap-ring-buffer.c
597607
FILE: ../../../third_party/wuffs/script/print-bits.go
598608
FILE: ../../../third_party/wuffs/script/print-crc32-example.go
599609
FILE: ../../../third_party/wuffs/script/print-crc32-magic-numbers.go
@@ -18568,6 +18578,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1856818578
LIBRARY: wuffs
1856918579
ORIGIN: ../../../third_party/wuffs/LICENSE
1857018580
TYPE: LicenseType.apache
18581+
FILE: ../../../third_party/wuffs/go.mod
1857118582
FILE: ../../../third_party/wuffs/script/bench-rust-gif-dot-rs/Cargo.toml
1857218583
FILE: ../../../third_party/wuffs/script/bench-rust-gif/Cargo.toml
1857318584
----------------------------------------------------------------------------------------------------

ci/licenses_golden/tool_signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: f090834bf22f515d09c8d64dc143db47
1+
Signature: 028d24b0ed18e117e64d68853b628ca9
22

tools/gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ def to_gn_args(args):
8989
gn_args['skia_use_sfntly'] = False # PDF handling dependency.
9090
gn_args['skia_enable_pdf'] = False # PDF handling.
9191
gn_args['skia_use_x11'] = False # Never add the X11 dependency (only takes effect on Linux).
92+
gn_args['skia_use_wuffs'] = True
9293
gn_args['skia_use_expat'] = args.target_os == 'android'
9394
gn_args['skia_use_fontconfig'] = args.enable_fontconfig
9495
gn_args['flutter_use_fontconfig'] = args.enable_fontconfig

tools/licenses/lib/main.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,6 +1652,7 @@ class _RepositorySkiaThirdPartyDirectory extends _RepositoryGenericThirdPartyDir
16521652
return entry.name != 'giflib' // contains nothing that ends up in the binary executable
16531653
&& entry.name != 'freetype' // we use our own version
16541654
&& entry.name != 'freetype2' // we use our own version
1655+
&& entry.name != 'gif' // not linked in
16551656
&& entry.name != 'icu' // we use our own version
16561657
&& entry.name != 'libjpeg-turbo' // we use our own version
16571658
&& entry.name != 'libpng' // we use our own version

0 commit comments

Comments
 (0)