diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-07-16 21:35:06 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-07-16 21:35:06 +0000 |
commit | 98b356a36bc9291a4f222d092afeeea0d5b5f379 (patch) | |
tree | 71fbda3964df30ef354afd36e3a9aba32978f762 /fxjs/cfxjse_context.h | |
parent | 31781107f6bda92e732fed805f62e8512bc78149 (diff) | |
download | pdfium-98b356a36bc9291a4f222d092afeeea0d5b5f379.tar.xz |
Use UnownedPtr<> to v8::Isolates.
Isolates are long-lived, but this may catch a few things.
Introduce CFX_V8IsolateDeleter for unique_ptr<v8::Isolate> usage.
Fix Dispose()/SetIsolate(nullptr) ordering in cjs_runtime.cpp
Remove one unused isolate member.
Flip protected -> private in one place.
Change-Id: I26cdd120f799192e93b0d9d04dcde8f348dc21f3
Reviewed-on: https://pdfium-review.googlesource.com/37931
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs/cfxjse_context.h')
-rw-r--r-- | fxjs/cfxjse_context.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fxjs/cfxjse_context.h b/fxjs/cfxjse_context.h index b4db8f7a30..91c76d4c7a 100644 --- a/fxjs/cfxjse_context.h +++ b/fxjs/cfxjse_context.h @@ -10,6 +10,7 @@ #include <memory> #include <vector> +#include "core/fxcrt/unowned_ptr.h" #include "fxjs/fxjse.h" #include "v8/include/v8.h" @@ -28,7 +29,7 @@ class CFXJSE_Context { explicit CFXJSE_Context(v8::Isolate* pIsolate); ~CFXJSE_Context(); - v8::Isolate* GetIsolate() const { return m_pIsolate; } + v8::Isolate* GetIsolate() const { return m_pIsolate.Get(); } v8::Local<v8::Context> GetContext(); std::unique_ptr<CFXJSE_Value> GetGlobalObject(); void AddClass(std::unique_ptr<CFXJSE_Class> pClass); @@ -38,12 +39,12 @@ class CFXJSE_Context { CFXJSE_Value* lpRetValue, CFXJSE_Value* lpNewThisObject = nullptr); - protected: + private: CFXJSE_Context(const CFXJSE_Context&) = delete; CFXJSE_Context& operator=(const CFXJSE_Context&) = delete; v8::Global<v8::Context> m_hContext; - v8::Isolate* m_pIsolate; + UnownedPtr<v8::Isolate> m_pIsolate; std::vector<std::unique_ptr<CFXJSE_Class>> m_rgClasses; }; |