diff options
| author | thestig <thestig@chromium.org> | 2015-10-03 05:09:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-03 12:10:47 +0000 |
| commit | b331e81dd0357eb0c483cfac3e3fe2a594fe54ef (patch) | |
| tree | 053764b78ea68b5f4297f73f88de7c0be55d7992 /pdf | |
| parent | 5693a8522953e3511d31fd915716628b202d56f7 (diff) | |
| download | chromium_src-b331e81dd0357eb0c483cfac3e3fe2a594fe54ef.zip chromium_src-b331e81dd0357eb0c483cfac3e3fe2a594fe54ef.tar.gz chromium_src-b331e81dd0357eb0c483cfac3e3fe2a594fe54ef.tar.bz2 | |
Roll PDFium revision to 3dedace and use the new init API.
Also pick up another bug fix in the DEPS roll.
https://pdfium.googlesource.com/pdfium.git/+log/b8a0747..3dedace
BUG=531339,537173
Review URL: https://codereview.chromium.org/1383783003
Cr-Commit-Position: refs/heads/master@{#352254}
Diffstat (limited to 'pdf')
| -rw-r--r-- | pdf/pdfium/pdfium_engine.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc index 221c7e8..369aa20 100644 --- a/pdf/pdfium/pdfium_engine.cc +++ b/pdf/pdfium/pdfium_engine.cc @@ -591,7 +591,12 @@ std::string GetDocumentMetadata(FPDF_DOCUMENT doc, const std::string& key) { } // namespace bool InitializeSDK() { - FPDF_InitLibrary(); + FPDF_LIBRARY_CONFIG config; + config.version = 2; + config.m_pUserFontPaths = nullptr; + config.m_pIsolate = v8::Isolate::GetCurrent(); + config.m_v8EmbedderSlot = gin::kEmbedderPDFium; + FPDF_InitLibraryWithConfig(&config); #if defined(OS_LINUX) // Font loading doesn't work in the renderer sandbox in Linux. @@ -690,7 +695,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client) FPDF_FORMFILLINFO::FFI_GotoURL = Form_GotoURL; FPDF_FORMFILLINFO::FFI_GetLanguage = Form_GetLanguage; #endif // PDF_USE_XFA - IPDF_JSPLATFORM::version = 2; + IPDF_JSPLATFORM::version = 3; IPDF_JSPLATFORM::app_alert = Form_Alert; IPDF_JSPLATFORM::app_beep = Form_Beep; IPDF_JSPLATFORM::app_response = Form_Response; @@ -700,8 +705,6 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client) IPDF_JSPLATFORM::Doc_submitForm = Form_SubmitForm; IPDF_JSPLATFORM::Doc_gotoPage = Form_GotoPage; IPDF_JSPLATFORM::Field_browse = Form_Browse; - IPDF_JSPLATFORM::m_isolate = v8::Isolate::GetCurrent(); - IPDF_JSPLATFORM::m_v8EmbedderSlot = gin::kEmbedderPDFium; IFSDK_PAUSE::version = 1; IFSDK_PAUSE::user = NULL; |