1f3442ce5c035d22e2cc9fffc203892f2f749373 - pdfium

commit: 1f3442ce5c035d22e2cc9fffc203892f2f749373
[log]
author: Tom Sepez <tsepez@chromium.org>
Thu Jul 23 16:07:32 2015 -0700
committer: Tom Sepez <tsepez@chromium.org>
Thu Jul 23 16:07:32 2015 -0700
tree: 7c66063cf1e29cc48c81ca84e9d766a2e23f4b95
parent: 2f2ffece124e4ed4b96d2846263015d4b5ad6c00 [diff]

Merge to XFA: FX_BOOL combo patch.

Original Review URL: https://codereview.chromium.org/1257503002
Original Review URL: https://codereview.chromium.org/1253603002

Manual merge for:
  core/include/fxge/fx_font.h
  core/src/fxcodec/codec/codec_int.h
  fpdfsdk/src/javascript/PublicMethods.cpp

R=thestig@chromium.org

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

core/include/fpdfapi/fpdf_page.h[diff]
core/include/fxge/fx_dib.h[diff]
core/include/fxge/fx_font.h[diff]
core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp[diff]
core/src/fpdfapi/fpdf_page/fpdf_page.cpp[diff]
core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp[diff]
core/src/fpdfapi/fpdf_page/pageint.h[diff]
core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp[diff]
core/src/fpdftext/fpdf_text.cpp[diff]
core/src/fxcodec/codec/codec_int.h[diff]
core/src/fxcodec/codec/fx_codec_flate.cpp[diff]
core/src/fxcodec/codec/fx_codec_jpeg.cpp[diff]
core/src/fxcodec/jbig2/JBig2_Context.cpp[diff]
core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp[diff]
core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp[diff]
core/src/fxcrt/fx_basic_gcc.cpp[diff]
core/src/fxge/ge/fx_ge_fontmap.cpp[diff]
core/src/fxge/ge/fx_ge_linux.cpp[diff]
core/src/fxge/ge/text_int.h[diff]
fpdfsdk/src/fpdf_sysfontinfo.cpp[diff]
fpdfsdk/src/fpdf_transformpage.cpp[diff]
fpdfsdk/src/javascript/PublicMethods.cpp[diff]
public/fpdf_sysfontinfo.h[diff]

23 files changed

tree: 7c66063cf1e29cc48c81ca84e9d766a2e23f4b95

build/
core/
fpdfsdk/
public/
samples/
test/
testing/
third_party/
xfa/
.gitignore
AUTHORS
BUILD.gn
codereview.settings
DEPS
LICENSE
OWNERS
pdfium.gyp
README
xfa.gyp