Have Skia use Wuffs v0.3 not v0.2

Skia-uses-Wuffs is still disabled by default in Chromium, but when
enabled, it now uses a newer Wuffs version, the same as upstream Skia.

New in Wuffs v0.3 is a finer sub-division of the base module, but the
main reason to upgrade is to track upstream Skia.

Change-Id: I5d0e152d45cccc24389a8091f93728047742943a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2256918Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782163}

skia/BUILD.gn

@@ -40,10 +40,12 @@ buildflag_header("buildflags") {
 
 # External-facing config for dependent code.
 config("skia_config") {
+  defines = []
   include_dirs = [ "//third_party/skia" ]
 
   if (!is_ios) {
     if (enable_skia_wuffs_gif) {
+      defines += [ "SK_FAVOR_WUFFS_V_0_3_OVER_V_0_2" ]
       include_dirs += [ "//third_party/wuffs/src/release/c" ]
     } else {
       include_dirs += [ "//third_party/libgifcodec" ]
@@ -54,7 +56,7 @@ config("skia_config") {
     configs = [ "//third_party/vulkan_headers:vulkan_headers_config" ]
   }
 
-  defines = [
+  defines += [
     "SK_CODEC_DECODES_PNG",
     "SK_CODEC_DECODES_WEBP",
     "SK_ENCODE_PNG",

third_party/wuffs/BUILD.gn

@@ -64,7 +64,9 @@ static_library("wuffs") {
     # Do not modify this list without considering the "consult
     # ENG_REVIEW_OWNERS" comment at the top of this file.
     "WUFFS_CONFIG__MODULES",
-    "WUFFS_CONFIG__MODULE__BASE",
+    "WUFFS_CONFIG__MODULE__BASE__CORE",
+    "WUFFS_CONFIG__MODULE__BASE__INTERFACES",
+    "WUFFS_CONFIG__MODULE__BASE__PIXCONV",
     "WUFFS_CONFIG__MODULE__GIF",
     "WUFFS_CONFIG__MODULE__LZW",
   ]
@@ -73,7 +75,7 @@ static_library("wuffs") {
   # comment at the top of this file.
   visibility = [ "//skia" ]
 
-  sources = [ "src/release/c/wuffs-v0.2.c" ]
+  sources = [ "src/release/c/wuffs-v0.3.c" ]
 }
 # Do not add build targets, or change their configuration or visibility,
 # without considering the "consult ENG_REVIEW_OWNERS" comment at the top of