diff options
| author | tsepez <tsepez@chromium.org> | 2016-08-15 16:44:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-15 16:44:55 -0700 |
| commit | b4694249b336d1c0bea9222880b49dcf9284791d (patch) | |
| tree | 681a503d12000b78296bcacf4fce046922335950 /fpdfsdk/javascript/JS_EventHandler.cpp | |
| parent | 19cdfe4d73370b21709aefd9dce06cf463239fa1 (diff) | |
| download | pdfium-b4694249b336d1c0bea9222880b49dcf9284791d.tar.xz | |
Push v8::Isolate into CFXJS_Engine classchromium/2831
Nearly all the "loose" functions in FXJS become methods on
the CFJXS_Engine.
This is the "missing link" wrt some layering violatons that
have been around forever. We can stop passing &m_ variables
from CJS_ down into FXJS Initialization as a result.
Review-Url: https://codereview.chromium.org/2245863002
Diffstat (limited to 'fpdfsdk/javascript/JS_EventHandler.cpp')
| -rw-r--r-- | fpdfsdk/javascript/JS_EventHandler.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fpdfsdk/javascript/JS_EventHandler.cpp b/fpdfsdk/javascript/JS_EventHandler.cpp index 8dc1b8270c..fe9a909dc9 100644 --- a/fpdfsdk/javascript/JS_EventHandler.cpp +++ b/fpdfsdk/javascript/JS_EventHandler.cpp @@ -595,22 +595,22 @@ FX_BOOL CJS_EventHandler::Shift() { Field* CJS_EventHandler::Source() { CJS_Runtime* pRuntime = m_pJSContext->GetJSRuntime(); - v8::Local<v8::Object> pDocObj = FXJS_NewFxDynamicObj( - pRuntime->GetIsolate(), pRuntime, CJS_Document::g_nObjDefnID); + v8::Local<v8::Object> pDocObj = + pRuntime->NewFxDynamicObj(CJS_Document::g_nObjDefnID); ASSERT(!pDocObj.IsEmpty()); - v8::Local<v8::Object> pFieldObj = FXJS_NewFxDynamicObj( - pRuntime->GetIsolate(), pRuntime, CJS_Field::g_nObjDefnID); + v8::Local<v8::Object> pFieldObj = + pRuntime->NewFxDynamicObj(CJS_Field::g_nObjDefnID); ASSERT(!pFieldObj.IsEmpty()); CJS_Document* pJSDocument = - (CJS_Document*)FXJS_GetPrivate(pRuntime->GetIsolate(), pDocObj); + static_cast<CJS_Document*>(pRuntime->GetObjectPrivate(pDocObj)); Document* pDocument = (Document*)pJSDocument->GetEmbedObject(); pDocument->AttachDoc(m_pTargetDoc ? m_pTargetDoc : m_pJSContext->GetReaderDocument()); CJS_Field* pJSField = - (CJS_Field*)FXJS_GetPrivate(pRuntime->GetIsolate(), pFieldObj); + static_cast<CJS_Field*>(pRuntime->GetObjectPrivate(pFieldObj)); Field* pField = (Field*)pJSField->GetEmbedObject(); pField->AttachField(pDocument, m_strSourceName); return pField; @@ -618,22 +618,22 @@ Field* CJS_EventHandler::Source() { Field* CJS_EventHandler::Target_Field() { CJS_Runtime* pRuntime = m_pJSContext->GetJSRuntime(); - v8::Local<v8::Object> pDocObj = FXJS_NewFxDynamicObj( - pRuntime->GetIsolate(), pRuntime, CJS_Document::g_nObjDefnID); + v8::Local<v8::Object> pDocObj = + pRuntime->NewFxDynamicObj(CJS_Document::g_nObjDefnID); ASSERT(!pDocObj.IsEmpty()); - v8::Local<v8::Object> pFieldObj = FXJS_NewFxDynamicObj( - pRuntime->GetIsolate(), pRuntime, CJS_Field::g_nObjDefnID); + v8::Local<v8::Object> pFieldObj = + pRuntime->NewFxDynamicObj(CJS_Field::g_nObjDefnID); ASSERT(!pFieldObj.IsEmpty()); CJS_Document* pJSDocument = - (CJS_Document*)FXJS_GetPrivate(pRuntime->GetIsolate(), pDocObj); + static_cast<CJS_Document*>(pRuntime->GetObjectPrivate(pDocObj)); Document* pDocument = (Document*)pJSDocument->GetEmbedObject(); pDocument->AttachDoc(m_pTargetDoc ? m_pTargetDoc : m_pJSContext->GetReaderDocument()); CJS_Field* pJSField = - (CJS_Field*)FXJS_GetPrivate(pRuntime->GetIsolate(), pFieldObj); + static_cast<CJS_Field*>(pRuntime->GetObjectPrivate(pFieldObj)); Field* pField = (Field*)pJSField->GetEmbedObject(); pField->AttachField(pDocument, m_strTargetName); return pField; |