diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-10 11:56:37 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-10 11:56:37 -0700 |
| commit | 6df59849472958e7de96da6d9fc7b223b7c1f1c3 (patch) | |
| tree | 90b4908f6de484252f9757010b7002c4f0365a58 /fpdfsdk/src/javascript/JS_EventHandler.cpp | |
| parent | 0d0935d3d6603dd7d851b1d5828635230f4c43ca (diff) | |
| download | pdfium-6df59849472958e7de96da6d9fc7b223b7c1f1c3.tar.xz | |
Remove some abstractions in fxjs_v8.h.
It's too hard to keep mapping between v8 and fx abstractions; the lack
of transparency prevents those skilled in v8 only from working on this
code.
Apparently, the original intention was to confine v8 types to
fpdfsdk/{include,src}/jsapi, but fpdfsdk/{include,src}/javascript
is already well-polluted with v8 types.
Also remove no-op JS_SetThisObj().
Also remove unused ParserParams() [noticed because it was incorrectly
passing handles as pointers].
Also remove cast operator from CJS_Runtime and call GetIsolate()
explicitly.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1332973002 .
Diffstat (limited to 'fpdfsdk/src/javascript/JS_EventHandler.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/JS_EventHandler.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/fpdfsdk/src/javascript/JS_EventHandler.cpp b/fpdfsdk/src/javascript/JS_EventHandler.cpp index 1eee92ddc1..acaacf2943 100644 --- a/fpdfsdk/src/javascript/JS_EventHandler.cpp +++ b/fpdfsdk/src/javascript/JS_EventHandler.cpp @@ -615,11 +615,13 @@ Field* CJS_EventHandler::Source() { CJS_Runtime* pRuntime = m_pJSContext->GetJSRuntime(); - JSFXObject pDocObj = JS_NewFxDynamicObj( - *pRuntime, m_pJSContext, JS_GetObjDefnID(*pRuntime, L"Document")); + v8::Local<v8::Object> pDocObj = + JS_NewFxDynamicObj(pRuntime->GetIsolate(), m_pJSContext, + JS_GetObjDefnID(pRuntime->GetIsolate(), L"Document")); ASSERT(pDocObj.IsEmpty() == FALSE); - JSFXObject pFieldObj = JS_NewFxDynamicObj( - *pRuntime, m_pJSContext, JS_GetObjDefnID(*pRuntime, L"Field")); + v8::Local<v8::Object> pFieldObj = + JS_NewFxDynamicObj(pRuntime->GetIsolate(), m_pJSContext, + JS_GetObjDefnID(pRuntime->GetIsolate(), L"Field")); ASSERT(pFieldObj.IsEmpty() == FALSE); CJS_Document* pJSDocument = (CJS_Document*)JS_GetPrivate(pDocObj); @@ -650,11 +652,13 @@ Field* CJS_EventHandler::Target_Field() { CJS_Runtime* pRuntime = m_pJSContext->GetJSRuntime(); - JSFXObject pDocObj = JS_NewFxDynamicObj( - *pRuntime, m_pJSContext, JS_GetObjDefnID(*pRuntime, L"Document")); + v8::Local<v8::Object> pDocObj = + JS_NewFxDynamicObj(pRuntime->GetIsolate(), m_pJSContext, + JS_GetObjDefnID(pRuntime->GetIsolate(), L"Document")); ASSERT(pDocObj.IsEmpty() == FALSE); - JSFXObject pFieldObj = JS_NewFxDynamicObj( - *pRuntime, m_pJSContext, JS_GetObjDefnID(*pRuntime, L"Field")); + v8::Local<v8::Object> pFieldObj = + JS_NewFxDynamicObj(pRuntime->GetIsolate(), m_pJSContext, + JS_GetObjDefnID(pRuntime->GetIsolate(), L"Field")); ASSERT(pFieldObj.IsEmpty() == FALSE); CJS_Document* pJSDocument = (CJS_Document*)JS_GetPrivate(pDocObj); |