diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-07 10:17:53 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-07 10:17:53 -0700 |
| commit | a72e8e2c4392df725c7e35ed1ae3f891e79e49ec (patch) | |
| tree | 99eb91f764c428cd34a3b84e8b9e9bfb239d9e5a /testing/embedder_test.cpp | |
| parent | cd56a7d6fb05bd0babf316a84280a26ecc649d45 (diff) | |
| download | pdfium-a72e8e2c4392df725c7e35ed1ae3f891e79e49ec.tar.xz | |
Merge to XFA: Pass v8::Isolate to PDFium at init time.
New code changes in JS_Runtime.cpp.
(cherry picked from commit 3dedace9623fef6161a8666e53a4ab2b9be61e4c)
Original Review URL: https://codereview.chromium.org/1367033002 .
Also merge to XFA: Run FXJS_V8 embedder tests against a shared isolate,
since the two go together.
(cherry picked from commit 4ea721cb7954898a9722c389dae86c62957352d0)
Original Review URL: https://codereview.chromium.org/1377293004 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1381633008 .
Diffstat (limited to 'testing/embedder_test.cpp')
| -rw-r--r-- | testing/embedder_test.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp index 5dc5a66eb6..1a3c4c6e53 100644 --- a/testing/embedder_test.cpp +++ b/testing/embedder_test.cpp @@ -123,21 +123,21 @@ FPDF_BOOL Is_Data_Avail(FX_FILEAVAIL* pThis, size_t offset, size_t size) { void Add_Segment(FX_DOWNLOADHINTS* pThis, size_t offset, size_t size) {} EmbedderTest::EmbedderTest() - : document_(nullptr), + : default_delegate_(new EmbedderTest::Delegate()), + document_(nullptr), form_handle_(nullptr), avail_(nullptr), + external_isolate_(nullptr), loader_(nullptr), file_length_(0), file_contents_(nullptr) { memset(&hints_, 0, sizeof(hints_)); memset(&file_access_, 0, sizeof(file_access_)); memset(&file_avail_, 0, sizeof(file_avail_)); - default_delegate_ = new EmbedderTest::Delegate(); - delegate_ = default_delegate_; + delegate_ = default_delegate_.get(); } EmbedderTest::~EmbedderTest() { - delete default_delegate_; } void EmbedderTest::SetUp() { @@ -159,7 +159,12 @@ void EmbedderTest::SetUp() { v8::V8::SetSnapshotDataBlob(&snapshot_); #endif // V8_USE_EXTERNAL_STARTUP_DATA - FPDF_InitLibrary(); + FPDF_LIBRARY_CONFIG config; + config.version = 2; + config.m_pUserFontPaths = nullptr; + config.m_pIsolate = external_isolate_; + config.m_v8EmbedderSlot = 0; + FPDF_InitLibraryWithConfig(&config); UNSUPPORT_INFO* info = static_cast<UNSUPPORT_INFO*>(this); memset(info, 0, sizeof(UNSUPPORT_INFO)); |