diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-09-25 09:29:47 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-09-25 09:29:47 -0700 |
commit | 163f59b9a0b019539e9a463ec183c964e7317d5b (patch) | |
tree | 45044e7ac308813d031282c4665a4ba67db2ca17 /fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp | |
parent | 01c1e54a506329b36f87b0e37d3b419b70973342 (diff) | |
download | pdfium-163f59b9a0b019539e9a463ec183c964e7317d5b.tar.xz |
Revert "Revert "Merge to master: contention over isolate data slots""
This reverts commit 3b4382a847b5a7439a3107512dbe54c317108579.
The difference between this CL and the one that failed is
fxjs_v8.cpp:271. In master, we pass the runtime information
as:
v8::isolate -> v8::Context -> FXJS Runtime,
but in XFA:
V8::Isolate -> PerIsolate struct -> FXJS Runtime.
The master way is more correct, in that FXJS_Runtime is 1:1
with v8 contexts and many:1 (in theory) with isolates.
It looks like the XFA branch missed a patch along the way.
I'll do that next.
Having made this change, the only data in the per-isolate
struct will be the ptr array (on master); it will also
include the XFA context (on XFA). I've kept the struct on
master for the sake of similarity.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1365733003 .
Diffstat (limited to 'fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp')
-rw-r--r-- | fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp index 2671a91fff..7726c40c5e 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp @@ -31,7 +31,7 @@ class FXJSV8Embeddertest : public EmbedderTest { v8::Isolate::Scope isolate_scope(m_pIsolate); v8::HandleScope handle_scope(m_pIsolate); FXJS_Initialize(0); - FXJS_PrepareIsolate(m_pIsolate); + FXJS_PerIsolateData::SetUp(m_pIsolate); FXJS_InitializeRuntime(m_pIsolate, nullptr, nullptr, m_pPersistentContext); } |