Merge to XF: Disintermediation.
authorTom Sepez <tsepez@chromium.org>
Fri, 19 Jun 2015 20:56:28 +0000 (13:56 -0700)
committerTom Sepez <tsepez@chromium.org>
Fri, 19 Jun 2015 20:56:28 +0000 (13:56 -0700)
commitc49828916f5b0766f8d6f0fd5bf0a6cc5bd3c1ec
treec8305ef66d7ecad9cad2c1054c71da53bd8e89a6
parent6f93de501d591a6c2980d38a1ff0a6b5e434b80a
Merge to XF: Disintermediation.

(cherry picked from commit 012ada613a1462f109eb59790f8e5ee91aacdb7e)
Review URL: https://codereview.chromium.org/1199553002.

TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1197893002.
15 files changed:
BUILD.gn
core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp
core/src/fxcodec/codec/fx_codec_flate.cpp
core/src/fxcodec/codec/fx_codec_icc.cpp
core/src/fxcodec/codec/fx_codec_jpeg.cpp
core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
core/src/fxcodec/fx_lpng/lpng_v163/pngstruct.h
core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c
core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c
core/src/fxcodec/fx_zlib/include/fx_zlib.h [deleted file]
core/src/fxcodec/lcms2/fx_lcms2.h [deleted file]
core/src/fxcodec/lcms2/fx_lcms2_plugin.h [deleted file]
core/src/fxcodec/libjpeg/fx_libjpeg.h [deleted file]
pdfium.gyp
samples/image_diff_png.cc