diff options
| -rw-r--r-- | fxjs/cfxjse_context.cpp | 11 | ||||
| -rw-r--r-- | fxjs/cfxjse_context.h | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/fxjs/cfxjse_context.cpp b/fxjs/cfxjse_context.cpp index 59cb4af9a7..e9297e5bb2 100644 --- a/fxjs/cfxjse_context.cpp +++ b/fxjs/cfxjse_context.cpp @@ -90,17 +90,10 @@ v8::Local<v8::Object> GetGlobalObjectFromContext( return hContext->Global()->GetPrototype().As<v8::Object>(); } -} // namespace - -// Note, not in the anonymous namespace due to the friend call -// in cfxjse_context.h -// TODO(dsinclair): Remove the friending, use public methods. class CFXJSE_ScopeUtil_IsolateHandleContext { public: explicit CFXJSE_ScopeUtil_IsolateHandleContext(CFXJSE_Context* pContext) - : m_parent(pContext->m_pIsolate), - m_cscope(v8::Local<v8::Context>::New(pContext->m_pIsolate, - pContext->m_hContext)) {} + : m_parent(pContext->GetIsolate()), m_cscope(pContext->GetContext()) {} private: CFXJSE_ScopeUtil_IsolateHandleContext( @@ -113,6 +106,8 @@ class CFXJSE_ScopeUtil_IsolateHandleContext { v8::Context::Scope m_cscope; }; +} // namespace + void FXJSE_UpdateObjectBinding(v8::Local<v8::Object>& hObject, CFXJSE_HostObject* lpNewBinding) { ASSERT(!hObject.IsEmpty()); diff --git a/fxjs/cfxjse_context.h b/fxjs/cfxjse_context.h index 8ab955197c..b4db8f7a30 100644 --- a/fxjs/cfxjse_context.h +++ b/fxjs/cfxjse_context.h @@ -39,8 +39,6 @@ class CFXJSE_Context { CFXJSE_Value* lpNewThisObject = nullptr); protected: - friend class CFXJSE_ScopeUtil_IsolateHandleContext; - CFXJSE_Context(const CFXJSE_Context&) = delete; CFXJSE_Context& operator=(const CFXJSE_Context&) = delete; |