From 0b2a9874bddf44b4226fcbafa9ce159a9b3735a8 Mon Sep 17 00:00:00 2001 From: weili Date: Wed, 21 Sep 2016 11:50:43 -0700 Subject: Set up isolate in CFXJS_Engine's constructor CFXJS_Engine class should always be constructed with an isolate, except for its subclasses which may need to create an isolate by themselves. Move SetIsolate() function to be protected so that only subclasses can access it. Review-Url: https://codereview.chromium.org/2354353002 --- fxjs/include/fxjs_v8.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'fxjs/include') diff --git a/fxjs/include/fxjs_v8.h b/fxjs/include/fxjs_v8.h index c08cc8b7ad..8b5fc8399a 100644 --- a/fxjs/include/fxjs_v8.h +++ b/fxjs/include/fxjs_v8.h @@ -138,7 +138,7 @@ size_t FXJS_GlobalIsolateRefCount(); class CFXJS_Engine { public: - CFXJS_Engine(); + explicit CFXJS_Engine(v8::Isolate* pIsolate); ~CFXJS_Engine(); using Constructor = void (*)(CFXJS_Engine* pEngine, @@ -155,8 +155,6 @@ class CFXJS_Engine { CFXJS_Engine* pEngine); #endif // PDF_ENABLE_XFA - // TODO(tsepez): to constructor. - void SetIsolate(v8::Isolate* pIsolate) { m_isolate = pIsolate; } v8::Isolate* GetIsolate() const { return m_isolate; } // Always returns a valid, newly-created objDefnID. @@ -258,6 +256,11 @@ class CFXJS_Engine { v8::Local WSToJSString(const CFX_WideString& wsPropertyName); void Error(const CFX_WideString& message); + protected: + CFXJS_Engine(); + + void SetIsolate(v8::Isolate* pIsolate) { m_isolate = pIsolate; } + private: v8::Isolate* m_isolate; v8::Global m_V8PersistentContext; -- cgit v1.2.3