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

Re-enable the Wuffs GIF decoder #9466

Merged
merged 1 commit into from
Jul 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ deps = {
Var('chromium_git') + '/webm/libwebp.git' + '@' + '0.6.0',

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

'src/third_party/fontconfig/src':
Var('chromium_git') + '/external/fontconfig.git' + '@' + 'c336b8471877371f0190ba06f7547c54e2b890ba',
Expand Down
547 changes: 2 additions & 545 deletions ci/licenses_golden/licenses_skia

Large diffs are not rendered by default.

55 changes: 33 additions & 22 deletions ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 867dd399b0f19bf93a3ed95b59498779
Signature: ccd483c87594ed0c5e461273b748f428

UNUSED LICENSES:

Expand Down Expand Up @@ -517,27 +517,6 @@ FILE: ../../../third_party/vulkan/include/vulkan/vulkan_xlib.h
FILE: ../../../third_party/vulkan/include/vulkan/vulkan_xlib_xrandr.h
FILE: ../../../third_party/wuffs/cmd/commonflags/commonflags.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/genlib.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/all-impl.c
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/core-private.h
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/core-public.h
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/image-impl.c
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/image-private.h
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/image-public.h
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/io-private.h
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/io-public.h
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/memory-private.h
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/memory-public.h
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/range-private.h
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/base/range-public.h
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/builtin.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/cgen.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/data.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/expr.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/func.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/gen.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/resume.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/statement.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/internal/cgen/var.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/main.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/release.go
FILE: ../../../third_party/wuffs/cmd/wuffs-c/test.go
Expand All @@ -553,6 +532,28 @@ FILE: ../../../third_party/wuffs/example/zcat/zcat.c
FILE: ../../../third_party/wuffs/fuzz/c/fuzzlib/fuzzlib.c
FILE: ../../../third_party/wuffs/fuzz/c/std/gif_fuzzer.c
FILE: ../../../third_party/wuffs/fuzz/c/std/zlib_fuzzer.c
FILE: ../../../third_party/wuffs/internal/cgen/base/all-impl.c
FILE: ../../../third_party/wuffs/internal/cgen/base/core-private.h
FILE: ../../../third_party/wuffs/internal/cgen/base/core-public.h
FILE: ../../../third_party/wuffs/internal/cgen/base/image-impl.c
FILE: ../../../third_party/wuffs/internal/cgen/base/image-private.h
FILE: ../../../third_party/wuffs/internal/cgen/base/image-public.h
FILE: ../../../third_party/wuffs/internal/cgen/base/io-private.h
FILE: ../../../third_party/wuffs/internal/cgen/base/io-public.h
FILE: ../../../third_party/wuffs/internal/cgen/base/memory-private.h
FILE: ../../../third_party/wuffs/internal/cgen/base/memory-public.h
FILE: ../../../third_party/wuffs/internal/cgen/base/range-private.h
FILE: ../../../third_party/wuffs/internal/cgen/base/range-public.h
FILE: ../../../third_party/wuffs/internal/cgen/builtin.go
FILE: ../../../third_party/wuffs/internal/cgen/cgen.go
FILE: ../../../third_party/wuffs/internal/cgen/data.go
FILE: ../../../third_party/wuffs/internal/cgen/expr.go
FILE: ../../../third_party/wuffs/internal/cgen/func.go
FILE: ../../../third_party/wuffs/internal/cgen/gen.go
FILE: ../../../third_party/wuffs/internal/cgen/resume.go
FILE: ../../../third_party/wuffs/internal/cgen/statement.go
FILE: ../../../third_party/wuffs/internal/cgen/var.go
FILE: ../../../third_party/wuffs/internal/testcut/testcut.go
FILE: ../../../third_party/wuffs/lang/ast/ast.go
FILE: ../../../third_party/wuffs/lang/ast/eq.go
FILE: ../../../third_party/wuffs/lang/ast/sort.go
Expand All @@ -576,9 +577,17 @@ FILE: ../../../third_party/wuffs/lang/token/token.go
FILE: ../../../third_party/wuffs/lang/wuffsroot/wuffsroot.go
FILE: ../../../third_party/wuffs/lib/base38/base38.go
FILE: ../../../third_party/wuffs/lib/base38/base38_test.go
FILE: ../../../third_party/wuffs/lib/flatecut/flatecut.go
FILE: ../../../third_party/wuffs/lib/flatecut/flatecut_test.go
FILE: ../../../third_party/wuffs/lib/interval/interval.go
FILE: ../../../third_party/wuffs/lib/interval/interval_test.go
FILE: ../../../third_party/wuffs/lib/interval/radial_test.go
FILE: ../../../third_party/wuffs/lib/rac/example_test.go
FILE: ../../../third_party/wuffs/lib/rac/rac.go
FILE: ../../../third_party/wuffs/lib/rac/writer.go
FILE: ../../../third_party/wuffs/lib/rac/writer_test.go
FILE: ../../../third_party/wuffs/lib/zlibcut/zlibcut.go
FILE: ../../../third_party/wuffs/lib/zlibcut/zlibcut_test.go
FILE: ../../../third_party/wuffs/release/c/wuffs-unsupported-snapshot.c
FILE: ../../../third_party/wuffs/release/c/wuffs-v0.2.c
FILE: ../../../third_party/wuffs/script/adler32-standalone.c
Expand All @@ -594,6 +603,7 @@ FILE: ../../../third_party/wuffs/script/extract-giflzw.go
FILE: ../../../third_party/wuffs/script/extract-palette-indexes.go
FILE: ../../../third_party/wuffs/script/inline-c-relative-includes.go
FILE: ../../../third_party/wuffs/script/make-artificial.go
FILE: ../../../third_party/wuffs/script/mmap-ring-buffer.c
FILE: ../../../third_party/wuffs/script/print-bits.go
FILE: ../../../third_party/wuffs/script/print-crc32-example.go
FILE: ../../../third_party/wuffs/script/print-crc32-magic-numbers.go
Expand Down Expand Up @@ -18568,6 +18578,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
LIBRARY: wuffs
ORIGIN: ../../../third_party/wuffs/LICENSE
TYPE: LicenseType.apache
FILE: ../../../third_party/wuffs/go.mod
FILE: ../../../third_party/wuffs/script/bench-rust-gif-dot-rs/Cargo.toml
FILE: ../../../third_party/wuffs/script/bench-rust-gif/Cargo.toml
----------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: f090834bf22f515d09c8d64dc143db47
Signature: 028d24b0ed18e117e64d68853b628ca9

1 change: 1 addition & 0 deletions tools/gn
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ def to_gn_args(args):
gn_args['skia_use_sfntly'] = False # PDF handling dependency.
gn_args['skia_enable_pdf'] = False # PDF handling.
gn_args['skia_use_x11'] = False # Never add the X11 dependency (only takes effect on Linux).
gn_args['skia_use_wuffs'] = True
gn_args['skia_use_expat'] = args.target_os == 'android'
gn_args['skia_use_fontconfig'] = args.enable_fontconfig
gn_args['flutter_use_fontconfig'] = args.enable_fontconfig
Expand Down
1 change: 1 addition & 0 deletions tools/licenses/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1652,6 +1652,7 @@ class _RepositorySkiaThirdPartyDirectory extends _RepositoryGenericThirdPartyDir
return entry.name != 'giflib' // contains nothing that ends up in the binary executable
&& entry.name != 'freetype' // we use our own version
&& entry.name != 'freetype2' // we use our own version
&& entry.name != 'gif' // not linked in
&& entry.name != 'icu' // we use our own version
&& entry.name != 'libjpeg-turbo' // we use our own version
&& entry.name != 'libpng' // we use our own version
Expand Down