diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-06 11:45:28 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-06 11:45:28 -0700 |
| commit | cd56a7d6fb05bd0babf316a84280a26ecc649d45 (patch) | |
| tree | 65a4ff0aa976f364e46d1ec69ebbe34ddbc99e90 /fpdfsdk/src/javascript/JS_EventHandler.cpp | |
| parent | 3745841a4c4ab915c98865c1dd71f9debc3e2f99 (diff) | |
| download | pdfium-cd56a7d6fb05bd0babf316a84280a26ecc649d45.tar.xz | |
Merge to XFA: Store object definition ID in each js_class.
Manual edits in JS_Define.h.
(cherry picked from commit f0a5b2803c09f3605dcd606e764ef604f0d2a8ea)
Original Review URL: https://codereview.chromium.org/1382263002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1382683008 .
Diffstat (limited to 'fpdfsdk/src/javascript/JS_EventHandler.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/JS_EventHandler.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/fpdfsdk/src/javascript/JS_EventHandler.cpp b/fpdfsdk/src/javascript/JS_EventHandler.cpp index 42d61f4c1e..dd5c4427ce 100644 --- a/fpdfsdk/src/javascript/JS_EventHandler.cpp +++ b/fpdfsdk/src/javascript/JS_EventHandler.cpp @@ -613,13 +613,12 @@ FX_BOOL CJS_EventHandler::Shift() { Field* CJS_EventHandler::Source() { CJS_Runtime* pRuntime = m_pJSContext->GetJSRuntime(); 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 = - FXJS_NewFxDynamicObj(pRuntime->GetIsolate(), m_pJSContext, - FXJS_GetObjDefnID(pRuntime->GetIsolate(), L"Field")); - ASSERT(pFieldObj.IsEmpty() == FALSE); + pRuntime->GetIsolate(), m_pJSContext, CJS_Document::g_nObjDefnID); + ASSERT(!pDocObj.IsEmpty()); + + v8::Local<v8::Object> pFieldObj = FXJS_NewFxDynamicObj( + pRuntime->GetIsolate(), m_pJSContext, CJS_Field::g_nObjDefnID); + ASSERT(!pFieldObj.IsEmpty()); CJS_Document* pJSDocument = (CJS_Document*)FXJS_GetPrivate(pRuntime->GetIsolate(), pDocObj); @@ -637,13 +636,12 @@ Field* CJS_EventHandler::Source() { Field* CJS_EventHandler::Target_Field() { CJS_Runtime* pRuntime = m_pJSContext->GetJSRuntime(); 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 = - FXJS_NewFxDynamicObj(pRuntime->GetIsolate(), m_pJSContext, - FXJS_GetObjDefnID(pRuntime->GetIsolate(), L"Field")); - ASSERT(pFieldObj.IsEmpty() == FALSE); + pRuntime->GetIsolate(), m_pJSContext, CJS_Document::g_nObjDefnID); + ASSERT(!pDocObj.IsEmpty()); + + v8::Local<v8::Object> pFieldObj = FXJS_NewFxDynamicObj( + pRuntime->GetIsolate(), m_pJSContext, CJS_Field::g_nObjDefnID); + ASSERT(!pFieldObj.IsEmpty()); CJS_Document* pJSDocument = (CJS_Document*)FXJS_GetPrivate(pRuntime->GetIsolate(), pDocObj); |