Compile Skia image encoders

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 97b0a7108a35c3d9a903ac837ac7be2e47fff379..02c9c8d8a89554a5289d7fe85904e439a1ff38ca 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -32,6 +32,7 @@ config("skia_config") {
     "//third_party/skia/include/config",
     "//third_party/skia/include/core",
     "//third_party/skia/include/effects",
+    "//third_party/skia/include/encode",
     "//third_party/skia/include/images",
     "//third_party/skia/include/lazy",
     "//third_party/skia/include/pathops",
@@ -43,6 +44,11 @@ config("skia_config") {
   ]
 
   defines = skia_for_chromium_defines
+  defines += [
+    "SK_HAS_JPEG_LIBRARY",
+    "SK_HAS_PNG_LIBRARY",
+    "SK_HAS_WEBP_LIBRARY",
+  ]
 
   if (is_win || is_mac) {
     defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ]
@@ -89,14 +95,15 @@ config("skia_config") {
 # Internal-facing config for Skia library code.
 config("skia_library_config") {
   # These include directories are only included for Skia code and are not
-  # exported to dependents. It's not clear if this is on purpose, but this
-  # matches the GYP build.
+  # exported to dependents.
   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",
+    "//third_party/skia/src/images",
     "//third_party/skia/src/opts",
     "//third_party/skia/src/pdf",
     "//third_party/skia/src/ports",
@@ -218,8 +225,6 @@ component("skia") {
     "ext/opacity_filter_canvas.h",
     "ext/recursive_gaussian_convolution.cc",
     "ext/recursive_gaussian_convolution.h",
-    "ext/skia_encode_image.cc",
-    "ext/skia_encode_image.h",
     "ext/skia_histogram.cc",
     "ext/skia_histogram.h",
     "ext/skia_memory_dump_provider.cc",
@@ -262,6 +267,11 @@ component("skia") {
   sources += [
     "//third_party/skia/src/fonts/SkFontMgr_indirect.cpp",
     "//third_party/skia/src/fonts/SkRemotableFontMgr.cpp",
+    "//third_party/skia/src/images/SkImageEncoder.cpp",
+    "//third_party/skia/src/images/SkJpegEncoder.cpp",
+    "//third_party/skia/src/images/SkJPEGWriteUtility.cpp",
+    "//third_party/skia/src/images/SkPngEncoder.cpp",
+    "//third_party/skia/src/images/SkWebpEncoder.cpp",
     "//third_party/skia/src/ports/SkGlobalInitialization_default.cpp",
     "//third_party/skia/src/ports/SkImageGenerator_none.cpp",
     "//third_party/skia/src/ports/SkOSFile_stdio.cpp",
@@ -401,6 +411,7 @@ component("skia") {
   configs += [
     ":skia_config",
     ":skia_library_config",
+    "//third_party/libpng:libpng_config",

[msarett1, 2017/05/11 13:27:08]

I'm not sure why this is necessary.  I needed it to get the compile to succeed
locally.

Without this change, some system version of png.h is included instead of the
third_party/libpng/png.h.  Any idea what might be going here?  It looks to me
like we should get the proper include directories just by depending on libpng.

[mtklein_C, 2017/05/11 13:52:46]

Does this seem like the right explanation?

   - :libpng_config provides the include path
   - :libpng_sources public_configs on :libpng_config, adding :libpng_config its
own configs and to the configs of anyone who directly depends on :libpng_sources
   - :libpng public_deps on :libpng_sources, adding a dependency on
:libpng_sources if you depend on :libpng, but not a direct one.

If you're playing around, you might try adding a public_configs on
:libpng_config to :libpng, and see if that lets you remove your own manual one
in :skia.  If it were me I'd probably find whoever wrote the BUILD.gn file to
see if this was intentional that you need to depend on both :libpng and
:libpng_config to use the library... it's possible that this is some sort of
convention Chromium uses?

     "//build/config/compiler:no_chromium_code",
   ]
   public_configs = [ ":skia_config" ]
@@ -410,6 +421,9 @@ component("skia") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//build/config/freetype",
+    "//third_party:jpeg",
+    "//third_party/libpng",
+    "//third_party/libwebp",
   ]
 
   if (is_linux) {