diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-17 15:25:23 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-17 15:25:23 -0700 |
| commit | 39bfe122b4867601051c56562a5ab9cf6be644ad (patch) | |
| tree | 73ea2387759b2ba2a80ab344da69dc063fc69172 /fpdfsdk/src/javascript/JS_EventHandler.cpp | |
| parent | 4babdcf9c7abc9edefb179e5ed23db8e7a5840f7 (diff) | |
| download | pdfium-39bfe122b4867601051c56562a5ab9cf6be644ad.tar.xz | |
Merge to XFA: Ensure functions in FXJS_V8 are prefixed by FXJS_.
Manual edits:
fpdfsdk/include/javascript/JS_Define.h
fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
fpdfsdk/src/javascript/Document.cpp
fpdfsdk/src/javascript/JS_Runtime.cpp
fpdfsdk/src/jsapi/fxjs_v8.cpp
(cherry picked from commit 506df426d5d64d68e9dc27ffebcf56f6c6a1bccf)
Original Review URL: https://codereview.chromium.org/1347833002 .
(cherry picked from commit 455019ca48f60bd285e043986471f51f17c69a0d)
Original Review URL: https://codereview.chromium.org/1349783003 .
(cherry picked from commit 1af240cc45480520b447be767686e73a29c48f9e)
Original Review URL: https://codereview.chromium.org/1348693003 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1356563003 .
Diffstat (limited to 'fpdfsdk/src/javascript/JS_EventHandler.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/JS_EventHandler.cpp | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/fpdfsdk/src/javascript/JS_EventHandler.cpp b/fpdfsdk/src/javascript/JS_EventHandler.cpp index acaacf2943..bd762b4946 100644 --- a/fpdfsdk/src/javascript/JS_EventHandler.cpp +++ b/fpdfsdk/src/javascript/JS_EventHandler.cpp @@ -615,19 +615,17 @@ Field* CJS_EventHandler::Source() { CJS_Runtime* pRuntime = m_pJSContext->GetJSRuntime(); - v8::Local<v8::Object> pDocObj = - JS_NewFxDynamicObj(pRuntime->GetIsolate(), m_pJSContext, - JS_GetObjDefnID(pRuntime->GetIsolate(), L"Document")); + v8::Local<v8::Object> pDocObj = FXJS_NewFxDynamicObj( + pRuntime->GetIsolate(), m_pJSContext, + FXJS_GetObjDefnID(pRuntime->GetIsolate(), L"Document")); ASSERT(pDocObj.IsEmpty() == FALSE); v8::Local<v8::Object> pFieldObj = - JS_NewFxDynamicObj(pRuntime->GetIsolate(), m_pJSContext, - JS_GetObjDefnID(pRuntime->GetIsolate(), L"Field")); + FXJS_NewFxDynamicObj(pRuntime->GetIsolate(), m_pJSContext, + FXJS_GetObjDefnID(pRuntime->GetIsolate(), L"Field")); ASSERT(pFieldObj.IsEmpty() == FALSE); - CJS_Document* pJSDocument = (CJS_Document*)JS_GetPrivate(pDocObj); - ASSERT(pJSDocument != NULL); + CJS_Document* pJSDocument = (CJS_Document*)FXJS_GetPrivate(pDocObj); Document* pDocument = (Document*)pJSDocument->GetEmbedObject(); - ASSERT(pDocument != NULL); if (m_pTargetDoc != NULL) pDocument->AttachDoc(m_pTargetDoc); else @@ -639,7 +637,7 @@ Field* CJS_EventHandler::Source() { // CPDF_FormField* pFormField = pWidget->GetFormField(); // ASSERT(pFormField); // CFX_WideString csFieldName = pFormField->GetFullName(); - CJS_Field* pJSField = (CJS_Field*)JS_GetPrivate(pFieldObj); + CJS_Field* pJSField = (CJS_Field*)FXJS_GetPrivate(pFieldObj); ASSERT(pJSField != NULL); Field* pField = (Field*)pJSField->GetEmbedObject(); ASSERT(pField != NULL); @@ -652,25 +650,23 @@ Field* CJS_EventHandler::Target_Field() { CJS_Runtime* pRuntime = m_pJSContext->GetJSRuntime(); - v8::Local<v8::Object> pDocObj = - JS_NewFxDynamicObj(pRuntime->GetIsolate(), m_pJSContext, - JS_GetObjDefnID(pRuntime->GetIsolate(), L"Document")); + v8::Local<v8::Object> pDocObj = FXJS_NewFxDynamicObj( + pRuntime->GetIsolate(), m_pJSContext, + FXJS_GetObjDefnID(pRuntime->GetIsolate(), L"Document")); ASSERT(pDocObj.IsEmpty() == FALSE); v8::Local<v8::Object> pFieldObj = - JS_NewFxDynamicObj(pRuntime->GetIsolate(), m_pJSContext, - JS_GetObjDefnID(pRuntime->GetIsolate(), L"Field")); + FXJS_NewFxDynamicObj(pRuntime->GetIsolate(), m_pJSContext, + FXJS_GetObjDefnID(pRuntime->GetIsolate(), L"Field")); ASSERT(pFieldObj.IsEmpty() == FALSE); - CJS_Document* pJSDocument = (CJS_Document*)JS_GetPrivate(pDocObj); - ASSERT(pJSDocument != NULL); + CJS_Document* pJSDocument = (CJS_Document*)FXJS_GetPrivate(pDocObj); Document* pDocument = (Document*)pJSDocument->GetEmbedObject(); - ASSERT(pDocument != NULL); if (m_pTargetDoc != NULL) pDocument->AttachDoc(m_pTargetDoc); else pDocument->AttachDoc(m_pJSContext->GetReaderDocument()); - CJS_Field* pJSField = (CJS_Field*)JS_GetPrivate(pFieldObj); + CJS_Field* pJSField = (CJS_Field*)FXJS_GetPrivate(pFieldObj); ASSERT(pJSField != NULL); Field* pField = (Field*)pJSField->GetEmbedObject(); |