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/Field.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/Field.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/Field.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp index 38262ce132..52f6321f4a 100644 --- a/fpdfsdk/src/javascript/Field.cpp +++ b/fpdfsdk/src/javascript/Field.cpp @@ -1038,7 +1038,7 @@ FX_BOOL Field::currentValueIndices(IFXJS_Context* cc, CFX_DWordArray array; - if (vp.GetType() == VT_number) { + if (vp.GetType() == CJS_Value::VT_number) { int iSelecting = 0; vp >> iSelecting; array.Add(iSelecting); @@ -3316,15 +3316,12 @@ FX_BOOL Field::buttonGetIcon(IFXJS_Context* cc, ASSERT(pRuntime != NULL); v8::Local<v8::Object> pObj = - JS_NewFxDynamicObj(pRuntime->GetIsolate(), pContext, - JS_GetObjDefnID(pRuntime->GetIsolate(), L"Icon")); + FXJS_NewFxDynamicObj(pRuntime->GetIsolate(), pContext, + FXJS_GetObjDefnID(pRuntime->GetIsolate(), L"Icon")); ASSERT(pObj.IsEmpty() == FALSE); - CJS_Icon* pJS_Icon = (CJS_Icon*)JS_GetPrivate(pObj); - ASSERT(pJS_Icon != NULL); - + CJS_Icon* pJS_Icon = (CJS_Icon*)FXJS_GetPrivate(pObj); Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject(); - ASSERT(pIcon != NULL); CPDF_Stream* pIconStream = NULL; if (nface == 0) @@ -3531,17 +3528,13 @@ FX_BOOL Field::getArray(IFXJS_Context* cc, for (int j = 0, jsz = swSort.GetSize(); j < jsz; j++) { CFX_WideString* pStr = swSort.GetAt(j); - v8::Local<v8::Object> pObj = - JS_NewFxDynamicObj(pRuntime->GetIsolate(), pContext, - JS_GetObjDefnID(pRuntime->GetIsolate(), L"Field")); + v8::Local<v8::Object> pObj = FXJS_NewFxDynamicObj( + pRuntime->GetIsolate(), pContext, + FXJS_GetObjDefnID(pRuntime->GetIsolate(), L"Field")); ASSERT(pObj.IsEmpty() == FALSE); - CJS_Field* pJSField = (CJS_Field*)JS_GetPrivate(pObj); - ASSERT(pJSField != NULL); - + CJS_Field* pJSField = (CJS_Field*)FXJS_GetPrivate(pObj); Field* pField = (Field*)pJSField->GetEmbedObject(); - ASSERT(pField != NULL); - pField->AttachField(m_pJSDoc, *pStr); CJS_Value FormFieldValue(m_isolate); |