Commit d4e501a5 authored by Nigel Tao's avatar Nigel Tao Committed by Commit Bot

Let Skia optionally use Wuffs for GIF decoding

This isn't enabled by default yet. This commit should not change the
generated binaries.

Bug: 1014044
Change-Id: I1edd29dc6533f7407043bee4d3399fb6c39b4068
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1874412Reviewed-by: default avatarLeon Scroggins <scroggo@chromium.org>
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708751}
parent 8a03e2cb
......@@ -24,12 +24,19 @@ skia_support_pdf = !is_ios && enable_basic_printing
skia_support_skottie = true
declare_args() {
enable_skia_wuffs_gif = false
skia_whitelist_serialized_typefaces = false
}
# External-facing config for dependent code.
config("skia_config") {
include_dirs = [ "//third_party/skia" ]
if (!is_ios) {
if (enable_skia_wuffs_gif) {
include_dirs += [ "//third_party/wuffs/src/release/c" ]
}
}
if (enable_vulkan) {
include_dirs += [
"//third_party/vulkan/include",
......@@ -47,6 +54,9 @@ config("skia_config") {
if (!is_ios) {
defines += [ "SK_HAS_JPEG_LIBRARY" ]
if (enable_skia_wuffs_gif) {
defines += [ "SK_HAS_WUFFS_LIBRARY" ]
}
}
if (enable_vulkan) {
defines += [
......@@ -307,7 +317,6 @@ component("skia") {
"//third_party/skia/src/codec/SkCodecImageGenerator.cpp",
"//third_party/skia/src/codec/SkColorTable.cpp",
"//third_party/skia/src/codec/SkEncodedInfo.cpp",
"//third_party/skia/src/codec/SkGifCodec.cpp",
"//third_party/skia/src/codec/SkIcoCodec.cpp",
"//third_party/skia/src/codec/SkJpegCodec.cpp",
"//third_party/skia/src/codec/SkJpegDecoderMgr.cpp",
......@@ -324,8 +333,17 @@ component("skia") {
"//third_party/skia/src/images/SkJPEGWriteUtility.cpp",
"//third_party/skia/src/images/SkJpegEncoder.cpp",
"//third_party/skia/src/ports/SkImageGenerator_skia.cpp",
"//third_party/skia/third_party/gif/SkGifImageReader.cpp",
]
if (enable_skia_wuffs_gif) {
deps += [ "//third_party/wuffs" ]
sources += [ "//third_party/skia/src/codec/SkWuffsCodec.cpp" ]
} else {
sources += [
"//third_party/skia/src/codec/SkGifCodec.cpp",
"//third_party/skia/third_party/gif/SkGifImageReader.cpp",
]
}
}
if (current_cpu == "arm") {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment