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 /fpdfsdk/src/javascript/report.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 'fpdfsdk/src/javascript/report.h')
-rw-r--r-- | fpdfsdk/src/javascript/report.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpdfsdk/src/javascript/report.h b/fpdfsdk/src/javascript/report.h index 798106bb11..51b1c78303 100644 --- a/fpdfsdk/src/javascript/report.h +++ b/fpdfsdk/src/javascript/report.h @@ -15,11 +15,11 @@ class Report : public CJS_EmbedObj { ~Report() override; public: - FX_BOOL save(IFXJS_Context* cc, + FX_BOOL save(IJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError); - FX_BOOL writeText(IFXJS_Context* cc, + FX_BOOL writeText(IJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError); |