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/color.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/color.h')
| -rw-r--r-- | fpdfsdk/src/javascript/color.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/fpdfsdk/src/javascript/color.h b/fpdfsdk/src/javascript/color.h index 12b1f7a01b..3a6356ae75 100644 --- a/fpdfsdk/src/javascript/color.h +++ b/fpdfsdk/src/javascript/color.h @@ -15,26 +15,26 @@ class color : public CJS_EmbedObj { color(CJS_Object* pJSObject); ~color() override; - FX_BOOL black(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); - FX_BOOL blue(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); - FX_BOOL cyan(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); - FX_BOOL dkGray(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); - FX_BOOL gray(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); - FX_BOOL green(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); - FX_BOOL ltGray(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); - FX_BOOL magenta(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); - FX_BOOL red(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); - FX_BOOL transparent(IFXJS_Context* cc, + FX_BOOL black(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL blue(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL cyan(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL dkGray(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL gray(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL green(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL ltGray(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL magenta(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL red(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL transparent(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); - FX_BOOL white(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); - FX_BOOL yellow(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL white(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL yellow(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); - FX_BOOL convert(IFXJS_Context* cc, + FX_BOOL convert(IJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError); - FX_BOOL equal(IFXJS_Context* cc, + FX_BOOL equal(IJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError); |