Compile Skia image encoders

skia/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//printing/features/features.gni")
 import("//testing/test.gni")
 import("//third_party/skia/gn/shared_sources.gni")
@@ skipping 14 matching lines @@
 
 # External-facing config for dependent code.
 config("skia_config") {
   include_dirs = [
     "config",
     "ext",
     "//third_party/skia/include/c",
     "//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",
     "//third_party/skia/include/pdf",
     "//third_party/skia/include/pipe",
     "//third_party/skia/include/ports",
     "//third_party/skia/include/utils",
     "//third_party/skia/third_party/vulkan",
   ]
 
   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))" ]
   }
 
   if (is_component_build) {
     defines += [
       "SKIA_DLL",
       "GR_GL_IGNORE_ES3_MSAA=0",
     ]
@@ skipping 26 matching lines @@
   }
 
   if (skia_whitelist_serialized_typefaces) {
     defines += [ "SK_WHITELIST_SERIALIZED_TYPEFACES" ]
   }
 }
 
 # 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",
     "//third_party/skia/src/sfnt",
     "//third_party/skia/src/utils",
     "//third_party/skia/src/lazy",
   ]
   if (is_mac || is_ios) {
     include_dirs += [ "//third_party/skia/include/utils/mac" ]
   }
@@ skipping 101 matching lines @@
     "ext/fontmgr_default_linux.h",
     "ext/fontmgr_default_win.cc",
     "ext/fontmgr_default_win.h",
     "ext/google_logging.cc",
     "ext/image_operations.cc",
     "ext/image_operations.h",
     "ext/opacity_filter_canvas.cc",
     "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",
     "ext/skia_memory_dump_provider.h",
     "ext/skia_trace_memory_dump_impl.cc",
     "ext/skia_trace_memory_dump_impl.h",
     "ext/skia_utils_base.cc",
     "ext/skia_utils_base.h",
     "ext/skia_utils_ios.h",
     "ext/skia_utils_ios.mm",
@@ skipping 22 matching lines @@
   }
 
   # The imported Skia gni source paths are made absolute by gn.
   sources += skia_core_sources
   sources += skia_effects_sources
   sources += skia_utils_sources
   sources += skia_xps_sources
   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/SkJPEGWriteUtility.cpp",
+    "//third_party/skia/src/images/SkJpegEncoder.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",
     "//third_party/skia/src/sfnt/SkOTTable_name.cpp",
     "//third_party/skia/src/sfnt/SkOTUtils.cpp",
   ]
 
   # This and skia_opts are really the same conceptual target so share headers.
   allow_circular_includes_from = [ ":skia_opts" ]
 
@@ skipping 115 matching lines @@
     ]
   }
 
   if (is_clang && !is_nacl) {
     # Skia won't compile with some of the more strict clang warnings.
     # e.g. it does:
     #  SkASSERT(!"sk_out_of_memory");
     configs -= [ "//build/config/clang:extra_warnings" ]
   }
 
-  configs -= [ "//build/config/compiler:chromium_code" ]
+  #configs -= [ "//build/config/compiler:chromium_code" ]

[Elliot Glaysher, 2017/05/11 19:40:43]

just delete this; don't leave commented out code

[msarett1, 2017/05/11 20:01:27]

Oops, that is left over from my experiments.  Putting this back in, thanks for
catching.

   configs += [
     ":skia_config",
     ":skia_library_config",
     "//build/config/compiler:no_chromium_code",
   ]
   public_configs = [ ":skia_config" ]
 
   deps = [
     ":skia_opts",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//build/config/freetype",
+    "//third_party:jpeg",
+    "//third_party/libpng",
+    "//third_party/libwebp",
   ]
 
   if (is_linux) {
     if (use_pango) {
-      configs += [ "//build/config/linux/pangocairo" ]
+      configs += [
+        # libpng_config will be included automatically from deps.  We do this to
+        # ensure that it is included before the pangocairo path (which also has a png.h).

[Elliot Glaysher, 2017/05/11 19:40:43]

80 cols

[msarett1, 2017/05/11 20:01:27]

Done.

+        "//third_party/libpng:libpng_config",
+        "//build/config/linux/pangocairo",
+      ]
     }
     deps += [
       "//build/linux:fontconfig",
       "//third_party/expat",
       "//third_party/icu:icuuc",
     ]
   }
 
   if (is_android) {
     deps += [
@@ skipping 281 matching lines @@
 
     deps = [
       ":skia",
       "//base",
       "//base/test:test_support",
       "//build/config/sanitizers:deps",
       "//build/win:default_exe_manifest",
     ]
   }
 }