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/util.cpp | |
| 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/util.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/util.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/src/javascript/util.cpp index c83aa6f5bc..6a48c09a08 100644 --- a/fpdfsdk/src/javascript/util.cpp +++ b/fpdfsdk/src/javascript/util.cpp @@ -20,7 +20,7 @@ #include <ctype.h> #endif -static v8::Isolate* GetIsolate(IFXJS_Context* cc) { +static v8::Isolate* GetIsolate(IJS_Context* cc) { CJS_Context* pContext = (CJS_Context*)cc; ASSERT(pContext != NULL); @@ -124,7 +124,7 @@ int util::ParstDataType(std::wstring* sFormat) { return -1; } -FX_BOOL util::printf(IFXJS_Context* cc, +FX_BOOL util::printf(IJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) { @@ -187,7 +187,7 @@ FX_BOOL util::printf(IFXJS_Context* cc, return TRUE; } -FX_BOOL util::printd(IFXJS_Context* cc, +FX_BOOL util::printd(IJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) { @@ -400,7 +400,7 @@ void util::printd(const std::wstring& cFormat2, cPurpose = cFormat; } -FX_BOOL util::printx(IFXJS_Context* cc, +FX_BOOL util::printx(IJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) { @@ -500,7 +500,7 @@ void util::printx(const std::string& cFormat, } } -FX_BOOL util::scand(IFXJS_Context* cc, +FX_BOOL util::scand(IJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) { @@ -551,7 +551,7 @@ int64_t FX_atoi64(const char* nptr) { return sign == '-' ? -total : total; } -FX_BOOL util::byteToChar(IFXJS_Context* cc, +FX_BOOL util::byteToChar(IJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) { |