diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-02 16:43:15 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-02 16:43:15 -0700 |
| commit | 3dedace9623fef6161a8666e53a4ab2b9be61e4c (patch) | |
| tree | 78fba57e1a3edcd064dead99da9a01e8a56055eb /fpdfsdk/src/fpdfview.cpp | |
| parent | ac67d4765a8ac36cd00c9fc8b6f2b80a3e1cff72 (diff) | |
| download | pdfium-3dedace9623fef6161a8666e53a4ab2b9be61e4c.tar.xz | |
Pass v8::Isolate to PDFium at init time.
Move the external isolate and embedder slot from the
IPDF_JSPlatforms struct supplied at the
FPDFDOC_InitFormFillEnvironment() call time to arguments to
the FPDF_InitLibraryWithConfig() call.
This has several benefits:
-- Avoids the crash that could happen if multiple
FPDFDOC_InitFormFillEnvironmen() calls should happen to be
made by an embedder with different slot values.
-- Down the road, for XFA, there may be XFA but no FormFill
environment.
We support both forms for the time being, until the chrome
side catches up, at which point we will deprecate the old
way.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1367033002 .
Diffstat (limited to 'fpdfsdk/src/fpdfview.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdfview.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 3603af6d91..0bf6426b66 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -14,6 +14,7 @@ #include "../include/fsdk_define.h" #include "../include/fsdk_mgr.h" #include "../include/fsdk_rendercontext.h" +#include "../include/jsapi/fxjs_v8.h" CPDF_CustomAccess::CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess) { if (pFileAccess) @@ -109,6 +110,10 @@ DLLEXPORT void STDCALL FPDF_InitLibraryWithConfig( pModuleMgr->LoadEmbeddedCNS1CMaps(); pModuleMgr->LoadEmbeddedKorea1CMaps(); } + if (cfg && cfg->version >= 2) { + FXJS_Initialize(cfg->m_v8EmbedderSlot, + reinterpret_cast<v8::Isolate*>(cfg->m_pIsolate)); + } } DLLEXPORT void STDCALL FPDF_DestroyLibrary() { |