Use the Wuffs GIF decoder (#7658)

jason-simmons · web-flow · commit 351f5a35f395 · 2019-02-05T14:09:18.000-08:00
Fixes #23838
diff --git a/DEPS b/DEPS
@@ -369,6 +369,9 @@ deps = {
   'src/third_party/libwebp':
    Var('chromium_git') + '/webm/libwebp.git' + '@' + '0.6.0',
 
+  'src/third_party/wuffs':
+   Var('fuchsia_git') + '/third_party/wuffs' + '@' + 'a71538baa8f1f4053176c0d9f31bc12fd4e8e71b',
+
   'src/third_party/gyp':
    Var('chromium_git') + '/external/gyp.git' + '@' + '4801a5331ae62da9769a327f11c4213d32fb0dad',
 
diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia
diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: c3d53eebec5b6c8992029095408c2d8c
+Signature: 3265e06530be4b2f63aae56dd7a9e830
 
diff --git a/tools/gn b/tools/gn
@@ -85,6 +85,7 @@ def to_gn_args(args):
     gn_args['skia_use_x11'] = False        # Never add the X11 dependency (only takes effect on Linux).
     gn_args['skia_use_expat'] = args.target_os == 'android'
     gn_args['skia_use_fontconfig'] = False # Use the custom font manager instead.
+    gn_args['skia_use_wuffs'] = True
     gn_args['is_official_build'] = True    # Disable Skia test utilities.
 
     gn_args['is_debug'] = args.unoptimized
diff --git a/tools/licenses/lib/licenses.dart b/tools/licenses/lib/licenses.dart
@@ -230,6 +230,7 @@ abstract class License implements Comparable<License> {
     switch (url) {
       case 'Apache:2.0':
       case 'http://www.apache.org/licenses/LICENSE-2.0':
+      case 'https://www.apache.org/licenses/LICENSE-2.0':
         body = system.File('data/apache-license-2.0').readAsStringSync();
         type = LicenseType.apache;
         break;
diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart
@@ -1639,6 +1639,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
@@ -1698,6 +1699,23 @@ class _RepositoryVulkanDirectory extends _RepositoryDirectory {
   }
 }
 
+class _RepositoryWuffsDirectory extends _RepositoryDirectory {
+  _RepositoryWuffsDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+
+  @override
+  bool shouldRecurse(fs.IoNode entry) {
+    return entry.name != 'CONTRIBUTORS' // not linked in
+        && super.shouldRecurse(entry);
+  }
+
+  @override
+  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
+    if (entry.name == 'src')
+      return _RepositoryExcludeSubpathDirectory(this, entry, const <String>['spec']);
+    return super.createSubdirectory(entry);
+  }
+}
+
 class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDirectory {
   _RepositoryRootThirdPartyDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
 
@@ -1764,6 +1782,8 @@ class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDir
       return _RepositoryPkgDirectory(this, entry);
     if (entry.name == 'vulkan')
       return _RepositoryVulkanDirectory(this, entry);
+    if (entry.name == 'wuffs')
+      return _RepositoryWuffsDirectory(this, entry);
     return super.createSubdirectory(entry);
   }
 }
diff --git a/tools/licenses/lib/patterns.dart b/tools/licenses/lib/patterns.dart
@@ -651,7 +651,7 @@ final List<MultipleVersionedLicenseReferencePattern> csReferencesByUrl = <Multip
       r'^\1\2you may not use this file except in compliance with the License\. *\n'
       r'^\1\2You may obtain a copy of the License at *\n'
       r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2 *(http://www\.apache\.org/licenses/LICENSE-2\.0) *\n'
+      r'^\1\2 *(https?://www\.apache\.org/licenses/LICENSE-2\.0) *\n'
       r'^(?:(?:\1\2? *)? *\n)*'
       r'^\1\2Unless required by applicable law or agreed to in writing, software *\n'
       r'^\1\2distributed under the License is distributed on an "AS IS" BASIS, *\n'

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Signature: c3d53eebec5b6c8992029095408c2d8c`
	`1`	`+Signature: 3265e06530be4b2f63aae56dd7a9e830`
`2`	`2`