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/include/javascript | |
| 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/include/javascript')
| -rw-r--r-- | fpdfsdk/include/javascript/IJavaScript.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h index 4d70aa15aa..fc8bf2bd7c 100644 --- a/fpdfsdk/include/javascript/IJavaScript.h +++ b/fpdfsdk/include/javascript/IJavaScript.h @@ -17,7 +17,7 @@ class CPDFSDK_Document; class CPDF_Bookmark; class CPDF_FormField; -class IFXJS_Context { +class IJS_Context { public: virtual FX_BOOL RunScript(const CFX_WideString& script, CFX_WideString& info) = 0; @@ -129,17 +129,17 @@ class IFXJS_Context { virtual void EnableMessageBox(FX_BOOL bEnable) = 0; protected: - virtual ~IFXJS_Context() {} + virtual ~IJS_Context() {} }; -class IFXJS_Runtime { +class IJS_Runtime { public: - static IFXJS_Runtime* Create(CPDFDoc_Environment* pEnv); - virtual ~IFXJS_Runtime() {} + static IJS_Runtime* Create(CPDFDoc_Environment* pEnv); + virtual ~IJS_Runtime() {} - virtual IFXJS_Context* NewContext() = 0; - virtual void ReleaseContext(IFXJS_Context* pContext) = 0; - virtual IFXJS_Context* GetCurrentContext() = 0; + virtual IJS_Context* NewContext() = 0; + virtual void ReleaseContext(IJS_Context* pContext) = 0; + virtual IJS_Context* GetCurrentContext() = 0; virtual void SetReaderDocument(CPDFSDK_Document* pReaderDoc) = 0; virtual CPDFSDK_Document* GetReaderDocument() = 0; @@ -150,7 +150,7 @@ class IFXJS_Runtime { FXJSE_HVALUE hValue) = 0; protected: - IFXJS_Runtime() {} + IJS_Runtime() {} }; #endif // FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_ |