Chromium Code Reviews| Index: fxjs/include/cfxjse_context.h |
| diff --git a/fxjse/context.h b/fxjs/include/cfxjse_context.h |
| similarity index 89% |
| rename from fxjse/context.h |
| rename to fxjs/include/cfxjse_context.h |
| index 3cc7123f55f7467906f709127beb2b299d3c448e..882258fe570e9bd0a48a30c134c31ab36ce881c2 100644 |
| --- a/fxjse/context.h |
| +++ b/fxjs/include/cfxjse_context.h |
| @@ -1,17 +1,17 @@ |
| -// Copyright 2014 PDFium Authors. All rights reserved. |
| +// Copyright 2016 PDFium Authors. All rights reserved. |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com |
| -#ifndef FXJSE_CONTEXT_H_ |
| -#define FXJSE_CONTEXT_H_ |
| +#ifndef FXJS_INCLUDE_CFXJSE_CONTEXT_H_ |
| +#define FXJS_INCLUDE_CFXJSE_CONTEXT_H_ |
| #include <memory> |
| #include <vector> |
| #include "core/fxcrt/include/fx_basic.h" |
| -#include "fxjse/include/fxjse.h" |
| +#include "fxjs/include/fxjse.h" |
| #include "v8/include/v8.h" |
| class CFXJSE_Class; |
| @@ -24,6 +24,7 @@ class CFXJSE_Context { |
| v8::Isolate* pIsolate, |
| const FXJSE_CLASS_DESCRIPTOR* lpGlobalClass = nullptr, |
| CFXJSE_HostObject* lpGlobalObject = nullptr); |
| + |
| ~CFXJSE_Context(); |
| v8::Isolate* GetRuntime() { return m_pIsolate; } |
| @@ -34,17 +35,18 @@ class CFXJSE_Context { |
| CFXJSE_Value* lpNewThisObject = nullptr); |
| protected: |
| + friend class CFXJSE_Class; |
| + friend class CFXJSE_ScopeUtil_IsolateHandleContext; |
|
Tom Sepez
2016/07/11 22:12:28
I thought you renamed this one.
dsinclair
2016/07/12 13:38:30
I moved it, but I didn't rename it. It's moved int
|
| + |
| CFXJSE_Context(); |
| CFXJSE_Context(const CFXJSE_Context&); |
| explicit CFXJSE_Context(v8::Isolate* pIsolate); |
| + |
| CFXJSE_Context& operator=(const CFXJSE_Context&); |
| v8::Global<v8::Context> m_hContext; |
| v8::Isolate* m_pIsolate; |
| std::vector<std::unique_ptr<CFXJSE_Class>> m_rgClasses; |
| - |
| - friend class CFXJSE_Class; |
| - friend class CFXJSE_ScopeUtil_IsolateHandleContext; |
| }; |
| v8::Local<v8::Object> FXJSE_CreateReturnValue(v8::Isolate* pIsolate, |
| @@ -60,4 +62,4 @@ CFXJSE_HostObject* FXJSE_RetrieveObjectBinding( |
| const v8::Local<v8::Object>& hJSObject, |
| CFXJSE_Class* lpClass = nullptr); |
| -#endif // FXJSE_CONTEXT_H_ |
| +#endif // FXJS_INCLUDE_CFXJSE_CONTEXT_H_ |