diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-02-02 17:37:37 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-02-02 17:37:37 +0000 |
| commit | 1258f7f21725c703269581e0241fbad86d89209c (patch) | |
| tree | 4b065d6c432ee9e23995cab693a9eab73fbddfa1 /fxjs/cjs_runtime.cpp | |
| parent | 9cbd2dd8ff0812aae57a99d6a7dc285cc8b9e262 (diff) | |
| download | pdfium-1258f7f21725c703269581e0241fbad86d89209c.tar.xz | |
Remove V8 context from CJS_V8
Makes CFXJS_Engine and CFXJSE_Engine consistent with each other in
that both have a V8 context to themselves, and not one inheritted
from the CJS_V8 (which is now more per-isolate than per-context).
Consolidate NewLocalContext() and GetPersistentContext(), which both
did the exact same thing under the covers once inside v8 land.
Rename a few things to make it simpler.
Change-Id: I68905db9ad44253063da235fcb276a75627a2dbc
Reviewed-on: https://pdfium-review.googlesource.com/25170
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs/cjs_runtime.cpp')
| -rw-r--r-- | fxjs/cjs_runtime.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fxjs/cjs_runtime.cpp b/fxjs/cjs_runtime.cpp index 4031304b83..662269514a 100644 --- a/fxjs/cjs_runtime.cpp +++ b/fxjs/cjs_runtime.cpp @@ -180,7 +180,7 @@ CJS_EventContext* CJS_Runtime::GetCurrentEventContext() const { void CJS_Runtime::SetFormFillEnvToDocument() { v8::Isolate::Scope isolate_scope(GetIsolate()); v8::HandleScope handle_scope(GetIsolate()); - v8::Local<v8::Context> context = NewLocalContext(); + v8::Local<v8::Context> context = GetV8Context(); v8::Context::Scope context_scope(context); v8::Local<v8::Object> pThis = GetThisObj(); @@ -235,7 +235,7 @@ bool CJS_Runtime::GetValueByNameFromGlobalObject(const ByteStringView& utf8Name, CFXJSE_Value* pValue) { v8::Isolate::Scope isolate_scope(GetIsolate()); v8::HandleScope handle_scope(GetIsolate()); - v8::Local<v8::Context> context = NewLocalContext(); + v8::Local<v8::Context> context = GetV8Context(); v8::Context::Scope context_scope(context); v8::Local<v8::Value> propvalue = context->Global()->Get( v8::String::NewFromUtf8(GetIsolate(), utf8Name.unterminated_c_str(), @@ -256,10 +256,10 @@ bool CJS_Runtime::SetValueByNameInGlobalObject(const ByteStringView& utf8Name, v8::Isolate* pIsolate = GetIsolate(); v8::Isolate::Scope isolate_scope(pIsolate); v8::HandleScope handle_scope(pIsolate); - v8::Local<v8::Context> context = NewLocalContext(); + v8::Local<v8::Context> context = GetV8Context(); v8::Context::Scope context_scope(context); v8::Local<v8::Value> propvalue = - v8::Local<v8::Value>::New(GetIsolate(), pValue->DirectGetValue()); + v8::Local<v8::Value>::New(pIsolate, pValue->DirectGetValue()); context->Global()->Set( v8::String::NewFromUtf8(pIsolate, utf8Name.unterminated_c_str(), v8::String::kNormalString, utf8Name.GetLength()), |