diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-21 09:22:05 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-21 09:22:05 -0700 |
| commit | 116e4addeecd2cb779b1ab590bea2d091ca12915 (patch) | |
| tree | 1f313d843abb122a79b9272e17fb379292a89ffa /fpdfsdk/include/javascript | |
| parent | b2ed5de36ca387e0a9bbc3dfb9f5b568c7cc2ea8 (diff) | |
| download | pdfium-116e4addeecd2cb779b1ab590bea2d091ca12915.tar.xz | |
Merge to XFA:More tidy of CJS_Object, kill implicit cast operator
(cherry picked from commit 270fc65d5824eeedbb2ed17516a72721bde9c9ef)
Original Review URL: https://codereview.chromium.org/1349423006 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1357243002 .
Diffstat (limited to 'fpdfsdk/include/javascript')
| -rw-r--r-- | fpdfsdk/include/javascript/JS_Object.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fpdfsdk/include/javascript/JS_Object.h b/fpdfsdk/include/javascript/JS_Object.h index a7772f1cf9..c7f92ac61d 100644 --- a/fpdfsdk/include/javascript/JS_Object.h +++ b/fpdfsdk/include/javascript/JS_Object.h @@ -60,9 +60,7 @@ class CJS_Object { virtual FX_BOOL InitInstance(IFXJS_Context* cc) { return TRUE; } virtual FX_BOOL ExitInstance() { return TRUE; } - operator v8::Local<v8::Object>() { - return v8::Local<v8::Object>::New(m_pIsolate, m_pObject); - } + v8::Local<v8::Object> ToV8Object() { return m_pV8Object.Get(m_pIsolate); } // Takes ownership of |pObj|. void SetEmbedObject(CJS_EmbedObj* pObj) { m_pEmbedObj.reset(pObj); } @@ -81,7 +79,7 @@ class CJS_Object { protected: nonstd::unique_ptr<CJS_EmbedObj> m_pEmbedObj; - v8::Global<v8::Object> m_pObject; + v8::Global<v8::Object> m_pV8Object; v8::Isolate* m_pIsolate; }; |