diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-10-08 12:03:00 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-10-08 12:03:00 -0700 |
commit | ba038bc14bfeb4d011d57f388871f7f14c4c3c22 (patch) | |
tree | 2786d0c3d7c56492c09f9c01e4eae090023c4040 /samples/image_diff_png.h | |
parent | 4d4a442aa413cdf5e114c4e432ae930bc9d9e0f1 (diff) | |
download | pdfium-ba038bc14bfeb4d011d57f388871f7f14c4c3c22.tar.xz |
Merge to XFA: Rename IFXJS_Runtime and IFXJS_Context to IJS_.
Merge conflicts in:
fpdfsdk/src/javascript/Document.cpp
fpdfsdk/src/javascript/JS_Define.h
New code in:
fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
(cherry picked from commit 213a172779fddbd7e588ee2e2b3906ccc47d6896)
Original Review URL: https://codereview.chromium.org/1386173002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1395713002 .
Diffstat (limited to 'samples/image_diff_png.h')
0 files changed, 0 insertions, 0 deletions