Revert of Add SkCodec, including PNG implementation. (patchset #24 id:460001 of https://codereview.chromium.org/930283002/)

Reason for revert:
Breaking windows bots all over the place :(

Original issue's description:
> Add SkCodec, including PNG implementation.
>
> DM:
> Add a flag to use SkCodec instead of SkImageDecoder.
>
> SkCodec:
> Base class for codecs, allowing creation from an SkStream or an SkData.
> An SkCodec, on creation, knows properties of the data like its width and height. Further calls can be used to generate the image.
> TODO: Add scanline iterator
>
> SkPngCodec:
> New decoder for png. Wraps libpng. The code has been repurposed from SkImageDecoder_libpng.
> TODO: Handle other destination colortypes
> TODO: Substitute the transpose color
> TODO: Allow silencing warnings
> TODO: Use RGB instead of filler?
> TODO: sRGB
>
> SkSwizzler:
> Simplified version of SkScaledSampler. Unlike the sampler, this object does no sampling.
> TODO: Implement other swizzles.
>
> BUG=skia:3257
>
> Committed: https://skia.googlesource.com/skia/+/ca358852b4fed656d11107b2aaf28318a4518b49

TBR=reed@google.com,djsollen@google.com,msarett@google.com,mtklein@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3257

Review URL: https://codereview.chromium.org/972743003

5 files changed, 7 insertions, 105 deletions

diff --git a/gyp/codec.gyp b/gyp/codec.gyp
deleted file mode 100644
index b9627995ef..0000000000
--- a/gyp/codec.gyp
+++ /dev/null
@@ -1,29 +0,0 @@
-# GYP file for codec project.
-{
-  'targets': [
-    {
-      'target_name': 'codec',
-      'product_name': 'skia_codec',
-      'type': 'static_library',
-      'standalone_static_library': 1,
-      'dependencies': [
-        'core.gyp:*',
-        'libpng.gyp:libpng',
-      ],
-      'include_dirs': [
-        '../include/codec',
-        '../src/codec',
-      ],
-      'sources': [
-        '../src/codec/SkCodec.cpp',
-        '../src/codec/SkCodec_libpng.cpp',
-        '../src/codec/SkSwizzler.cpp',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../include/codec',
-        ],
-      },
-    },
-  ],
-}
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index dd2c084ff5..97501871a9 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -121,16 +121,6 @@
             'skia_freetype_static%': '0',
           }
         ],
-        [ 'skia_os in ["mac", "ios", "win"]', {
-            # skia_libpng_static - instead of linking libpng with '-lpng' and
-            #     including the headers from '/usr/include/png.h', compile and
-            #     statically link the version of libpng in
-            #     third_party/externals/libpng.
-            'skia_libpng_static%': '1',
-          }, {
-            'skia_libpng_static%': '0',
-          }
-        ],
       ],
 
       # skia_giflib_static - on OS variants that normally would link giflib
@@ -139,6 +129,11 @@
       #     giflib in third_party/externals/giflib.
       'skia_giflib_static%': '0',
 
+      # skia_libpng_static - on OS variants that normally would link libpng
+      #     with '-lpng' and include the headers from '/usr/include/png.h',
+      #     don't do that; instead compile and staticlly link the version of
+      #     libpng in third_party/externals/libpng.
+      'skia_libpng_static%': '0',
 
       # skia_no_fontconfig - On POSIX systems that would normally use the
       #     SkFontHost_fontconfig interface; use the SkFontHost_linux
diff --git a/gyp/copy_file.py b/gyp/copy_file.py
deleted file mode 100644
index 7268bf216f..0000000000
--- a/gyp/copy_file.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/python
-
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Copy a file.
-"""
-
-import argparse
-import os
-import shutil
-
-if __name__ == '__main__':
-  parser = argparse.ArgumentParser()
-  parser.add_argument('src', help='File to copy.')
-  parser.add_argument('dst', help='Location to copy to.')
-  args = parser.parse_args()
-
-  src = os.path.abspath(os.path.join(os.getcwd(), args.src))
-  dst = os.path.abspath(os.path.join(os.getcwd(), args.dst))
-
-  print 'Copying from %s to %s' % (src, dst)
-
-  src_dir = os.path.dirname(src)
-  if not os.path.exists(src_dir):
-    raise AssertionError('src directory %s does not exist!' % src_dir)
-
-  if not os.path.exists(src):
-    raise AssertionError('file to copy %s does not exist' % src)
-
-  dst_dir = os.path.dirname(dst)
-  if not os.path.exists(dst_dir):
-    print 'dst directory %s does not exist! creating it!' % dst_dir
-    os.makedirs(dst_dir)
-
-  shutil.copyfile(src, dst)
diff --git a/gyp/libpng.gyp b/gyp/libpng.gyp
index 96120a8a61..92ff8d5e77 100644
--- a/gyp/libpng.gyp
+++ b/gyp/libpng.gyp
@@ -32,35 +32,10 @@
               '-w',
               '-fvisibility=hidden',
             ],
-            'conditions': [
-              ['not arm_neon', {
-                'defines': [
-                    # FIXME: Why is this needed? Without it, pngpriv.h sets it
-                    # to 2 if __ARM_NEON is defined, but shouldn't __ARM_NEON
-                    # not be defined since arm_neon is 0?
-                    'PNG_ARM_NEON_OPT=0',
-                ],
-              }],
-            ],
-            'actions': [
-              {
-                'action_name': 'generate_pngconf',
-                'variables' : {
-                  'prebuilt': '../third_party/externals/libpng/scripts/pnglibconf.h.prebuilt',
-                  'generated': '../third_party/externals/libpng/pnglibconf.h',
-                },
-                'inputs': [
-                  '<(prebuilt)',
-                ],
-                'outputs': [
-                  '<(generated)',
-                ],
-                'action': ['python', 'copy_file.py', '<(prebuilt)', '<(generated)'],
-              },
-            ],
             'sources': [
               '../third_party/externals/libpng/png.c',
               '../third_party/externals/libpng/pngerror.c',
+              '../third_party/externals/libpng/pnggccrd.c',
               '../third_party/externals/libpng/pngget.c',
               '../third_party/externals/libpng/pngmem.c',
               '../third_party/externals/libpng/pngpread.c',
@@ -70,6 +45,7 @@
               '../third_party/externals/libpng/pngrutil.c',
               '../third_party/externals/libpng/pngset.c',
               '../third_party/externals/libpng/pngtrans.c',
+              '../third_party/externals/libpng/pngvcrd.c',
               '../third_party/externals/libpng/pngwio.c',
               '../third_party/externals/libpng/pngwrite.c',
               '../third_party/externals/libpng/pngwtran.c',
diff --git a/gyp/skia_lib.gyp b/gyp/skia_lib.gyp
index 80d4f8f5bf..cc4984aa7f 100644
--- a/gyp/skia_lib.gyp
+++ b/gyp/skia_lib.gyp
@@ -4,7 +4,6 @@
   'variables': {
     'component_libs': [
       'core.gyp:core',
-      'codec.gyp:codec',
       'effects.gyp:effects',
       'images.gyp:images',
       'opts.gyp:opts',