Move gif image decoder to SkCodec

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 124789e93bda1c51ee7965869bc7334896cd0fc7..cea616882962618a4bfaff1d1ec2f4d2dd586f25 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",
@@ -95,6 +96,7 @@ config("skia_library_config") {
   include_dirs = [
     "//third_party/skia/include/private",
     "//third_party/skia/include/client/android",
+    "//third_party/skia/src/codec",
     "//third_party/skia/src/core",
     "//third_party/skia/src/effects/gradients",
     "//third_party/skia/src/image",
@@ -104,6 +106,7 @@ 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",
   ]
   if (is_mac || is_ios) {
     include_dirs += [ "//third_party/skia/include/utils/mac" ]
@@ -261,6 +264,18 @@ 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/SkMaskSwizzler.cpp",
+    "//third_party/skia/src/codec/SkMasks.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",

[cblume, 2017/03/25 07:54:39]

I want to revisit this.

I think I eagerly included everything in skia/src/codec/ but we may not need it
all.

When I wanted to compare binary size, I saw SkSwizzler, SkBmpCodec,
SkBmpMaskCodec, and SkBmpRLECodec (and maybe others) in the final binary. They
weren't being stripped out. But they also might not be used.

[scroggo_chromium, 2017/04/05 18:06:14]

This is used by all of the SkCodecs.
They're used by SkCodec::NewFromStream, which will create an SkBmpCodec if it's
a BMP image. We have #ifdefs in SkCodec to remove some of them - specifically
the ones that depend on external libraries, but we could have more to disable
the ones you don't want.

[cblume, 2017/04/08 01:19:20]

Oh. In that case don't worry about it.
I was measuring binary size difference and concluded at the time "Oh, I guess
we'll only really get apples-to-apples comparisons once it is all moved over."
But when I reviewed this file I wondered if maybe I could remove them and get an
apples-to-apples comparison right now.

But I'm not too worried about it. I think we can ignore this for now.

     "//third_party/skia/src/fonts/SkFontMgr_indirect.cpp",
     "//third_party/skia/src/fonts/SkRemotableFontMgr.cpp",
     "//third_party/skia/src/ports/SkGlobalInitialization_default.cpp",
@@ -268,6 +283,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.