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/fpdfxfa | |
| 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/fpdfxfa')
| -rw-r--r-- | fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h index 1ddb99064f..3c33338b39 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h @@ -14,8 +14,8 @@ class CPDFXFA_Document; class CPDFXFA_Page;
class CPDFSDK_Document;
class CPDFDoc_Environment;
-class IFXJS_Runtime;
-class IFXJS_Context;
+class IJS_Runtime;
+class IJS_Context;
class IXFA_DocHandler;
class CPDFXFA_Document : public IXFA_DocProvider {
@@ -187,7 +187,7 @@ class CPDFXFA_Document : public IXFA_DocProvider { FX_BOOL _GetHValueByName(const CFX_ByteStringC& utf8Name,
FXJSE_HVALUE hValue,
- IFXJS_Runtime* runTime);
+ IJS_Runtime* runTime);
FX_BOOL _OnBeforeNotifySumbit();
void _OnAfterNotifySumbit();
FX_BOOL _NotifySubmit(FX_BOOL bPrevOrPost);
@@ -221,7 +221,7 @@ class CPDFXFA_Document : public IXFA_DocProvider { CFX_ArrayTemplate<CPDFXFA_Page*> m_XFAPageList;
CPDFSDK_Document* m_pSDKDoc;
CPDFXFA_App* m_pApp;
- IFXJS_Context* m_pJSContext;
+ IJS_Context* m_pJSContext;
int m_iDocType;
};
|