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_Value.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_Value.cpp')
-rw-r--r-- | fpdfsdk/src/javascript/JS_Value.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/src/javascript/JS_Value.cpp b/fpdfsdk/src/javascript/JS_Value.cpp index faa1eeb6fc..7fb2116e1f 100644 --- a/fpdfsdk/src/javascript/JS_Value.cpp +++ b/fpdfsdk/src/javascript/JS_Value.cpp @@ -39,7 +39,7 @@ CJS_Value::CJS_Value(v8::Isolate* isolate, const double& dValue) operator=(dValue); } -CJS_Value::CJS_Value(v8::Isolate* isolate, JSFXObject pJsObj) +CJS_Value::CJS_Value(v8::Isolate* isolate, v8::Local<v8::Object> pJsObj) : m_isolate(isolate) { operator=(pJsObj); } @@ -53,7 +53,7 @@ CJS_Value::CJS_Value(v8::Isolate* isolate, CJS_Document* pJsDoc) : m_isolate(isolate) { m_eType = VT_object; if (pJsDoc) - m_pValue = (JSFXObject)*pJsDoc; + m_pValue = (v8::Local<v8::Object>)*pJsDoc; } CJS_Value::CJS_Value(v8::Isolate* isolate, const FX_WCHAR* pWstr) @@ -168,13 +168,13 @@ void CJS_Value::operator=(v8::Local<v8::Object> pObj) { void CJS_Value::operator=(CJS_Object* pObj) { if (pObj) - operator=((JSFXObject)*pObj); + operator=((v8::Local<v8::Object>)*pObj); } void CJS_Value::operator=(CJS_Document* pJsDoc) { m_eType = VT_object; if (pJsDoc) { - m_pValue = static_cast<JSFXObject>(*pJsDoc); + m_pValue = static_cast<v8::Local<v8::Object>>(*pJsDoc); } } @@ -341,12 +341,12 @@ void CJS_PropValue::operator>>(CJS_Document*& ppJsDoc) const { ppJsDoc = static_cast<CJS_Document*>(CJS_Value::ToCJSObject()); } -void CJS_PropValue::operator<<(JSFXObject pObj) { +void CJS_PropValue::operator<<(v8::Local<v8::Object> pObj) { ASSERT(!m_bIsSetting); CJS_Value::operator=(pObj); } -void CJS_PropValue::operator>>(JSFXObject& ppObj) const { +void CJS_PropValue::operator>>(v8::Local<v8::Object>& ppObj) const { ASSERT(m_bIsSetting); ppObj = CJS_Value::ToV8Object(); } |