Move gif image decoder to SkCodec

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 9d39d53868cdd53ffaffc7620f9ef0cf72fbc13d..3ab716d79abbb88e34fb0f70d6ab986daf8101da 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -29,6 +29,7 @@ config("skia_config") {
     "config",
     "ext",
     "//third_party/skia/include/c",
+    "//third_party/skia/include/codec",
     "//third_party/skia/include/config",
     "//third_party/skia/include/core",
     "//third_party/skia/include/effects",
@@ -113,6 +114,8 @@ config("skia_library_config") {
     "//third_party/skia/src/sfnt",
     "//third_party/skia/src/utils",
     "//third_party/skia/src/lazy",
+    "//third_party/skia/third_party/gif",
+    "//third_party/skia/third_party/libjpeg-turbo",

[scroggo_chromium, 2017/05/18 15:55:56]

Is the problem that Skia isn't finding jpeg? Shouldn't this depend on the target
used by Chromium elsewhere?

[cblume, 2017/06/03 01:11:34]

Done.

   ]
   if (is_mac || is_ios) {
     include_dirs += [ "//third_party/skia/include/utils/mac" ]
@@ -268,6 +271,24 @@ component("skia") {
   sources += skia_utils_sources
   sources += skia_xps_sources
   sources += [
+    "//third_party/skia/src/codec/SkBmpCodec.cpp",
+    "//third_party/skia/src/codec/SkBmpMaskCodec.cpp",
+    "//third_party/skia/src/codec/SkBmpRLECodec.cpp",
+    "//third_party/skia/src/codec/SkBmpStandardCodec.cpp",
+    "//third_party/skia/src/codec/SkCodec.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",
+    "//third_party/skia/src/codec/SkJpegUtility.cpp",
+    "//third_party/skia/src/codec/SkMaskSwizzler.cpp",
+    "//third_party/skia/src/codec/SkMasks.cpp",
+    "//third_party/skia/src/codec/SkPngCodec.cpp",
+    "//third_party/skia/src/codec/SkSampler.cpp",
+    "//third_party/skia/src/codec/SkStreamBuffer.cpp",
+    "//third_party/skia/src/codec/SkSwizzler.cpp",
+    "//third_party/skia/src/codec/SkWbmpCodec.cpp",
+    "//third_party/skia/src/codec/SkWebpCodec.cpp",
     "//third_party/skia/src/fonts/SkFontMgr_indirect.cpp",
     "//third_party/skia/src/fonts/SkRemotableFontMgr.cpp",
     "//third_party/skia/src/images/SkImageEncoder.cpp",
@@ -280,6 +301,7 @@ component("skia") {
     "//third_party/skia/src/ports/SkOSFile_stdio.cpp",
     "//third_party/skia/src/sfnt/SkOTTable_name.cpp",
     "//third_party/skia/src/sfnt/SkOTUtils.cpp",
+    "//third_party/skia/third_party/gif/SkGifImageReader.cpp",
   ]
 
   # This and skia_opts are really the same conceptual target so share headers.