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/JS_Runtime.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/JS_Runtime.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/JS_Runtime.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index bc5443daf6..f97b454993 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -32,7 +32,7 @@ /* ------------------------------ CJS_Runtime ------------------------------ */ v8::Global<v8::ObjectTemplate>& _getGlobalObjectTemplate(v8::Isolate* pIsolate); -IFXJS_Runtime* IFXJS_Runtime::Create(CPDFDoc_Environment* pEnv) { +IJS_Runtime* IJS_Runtime::Create(CPDFDoc_Environment* pEnv) { return new CJS_Runtime(pEnv); } @@ -145,13 +145,13 @@ void CJS_Runtime::DefineJSObjects() { CJS_PrintParamsObj::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_DYNAMIC); } -IFXJS_Context* CJS_Runtime::NewContext() { +IJS_Context* CJS_Runtime::NewContext() { CJS_Context* p = new CJS_Context(this); m_ContextArray.Add(p); return p; } -void CJS_Runtime::ReleaseContext(IFXJS_Context* pContext) { +void CJS_Runtime::ReleaseContext(IJS_Context* pContext) { CJS_Context* pJSContext = (CJS_Context*)pContext; for (int i = 0, sz = m_ContextArray.GetSize(); i < sz; i++) { @@ -163,7 +163,7 @@ void CJS_Runtime::ReleaseContext(IFXJS_Context* pContext) { } } -IFXJS_Context* CJS_Runtime::GetCurrentContext() { +IJS_Context* CJS_Runtime::GetCurrentContext() { if (!m_ContextArray.GetSize()) return NULL; return m_ContextArray.GetAt(m_ContextArray.GetSize() - 1); |