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/src/javascript/JS_Object.cpp | |
| 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/src/javascript/JS_Object.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/JS_Object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp index 02978982d8..17e987d96a 100644 --- a/fpdfsdk/src/javascript/JS_Object.cpp +++ b/fpdfsdk/src/javascript/JS_Object.cpp @@ -83,7 +83,7 @@ void DisposeObject(const v8::WeakCallbackInfo<CJS_Object>& data) { data.SetSecondPassCallback(FreeObject); } -CJS_Object::CJS_Object(JSFXObject pObject) : m_pEmbedObj(NULL) { +CJS_Object::CJS_Object(v8::Local<v8::Object> pObject) : m_pEmbedObj(NULL) { v8::Local<v8::Context> context = pObject->CreationContext(); m_pIsolate = context->GetIsolate(); m_pObject.Reset(m_pIsolate, pObject); |