diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-10 12:28:37 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-10 12:28:37 -0700 |
| commit | 808a99e8c6f72713ca9492508faa4b8445ae0d33 (patch) | |
| tree | b171af528eac6ff284bcb257418f49c031f640cd /fpdfsdk/include/javascript/JS_Object.h | |
| parent | ab54bc0f66ca3130ea4780580060f75f20c12234 (diff) | |
| download | pdfium-808a99e8c6f72713ca9492508faa4b8445ae0d33.tar.xz | |
Merge to XFA: Remove some abstractions in fxjs_v8.h.
Conflicts:
fpdfsdk/src/javascript/Document.cpp
fpdfsdk/src/javascript/JS_Runtime.cpp
fpdfsdk/src/jsapi/fxjs_v8.cpp
New:
fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
(cherry picked from commit 6df59849472958e7de96da6d9fc7b223b7c1f1c3)
Original Review URL: https://codereview.chromium.org/1332973002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1334833003 .
Diffstat (limited to 'fpdfsdk/include/javascript/JS_Object.h')
| -rw-r--r-- | fpdfsdk/include/javascript/JS_Object.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpdfsdk/include/javascript/JS_Object.h b/fpdfsdk/include/javascript/JS_Object.h index 9fd7bff3d4..a7772f1cf9 100644 --- a/fpdfsdk/include/javascript/JS_Object.h +++ b/fpdfsdk/include/javascript/JS_Object.h @@ -48,7 +48,7 @@ class CJS_EmbedObj { class CJS_Object { public: - explicit CJS_Object(JSFXObject pObject); + explicit CJS_Object(v8::Local<v8::Object> pObject); virtual ~CJS_Object(); void MakeWeak(); @@ -60,7 +60,7 @@ class CJS_Object { virtual FX_BOOL InitInstance(IFXJS_Context* cc) { return TRUE; } virtual FX_BOOL ExitInstance() { return TRUE; } - operator JSFXObject() { + operator v8::Local<v8::Object>() { return v8::Local<v8::Object>::New(m_pIsolate, m_pObject); } |