Roll PDFium revision to 3dedace and use the new init API.

pdf/pdfium/pdfium_engine.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "pdf/pdfium/pdfium_engine.h"
 
 #include <math.h>
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 573 matching lines @@
   PDFiumAPIStringBufferSizeInBytesAdapter<base::string16> string_adapter(
       &value, size, false);
   string_adapter.Close(
       FPDF_GetMetaText(doc, key.c_str(), string_adapter.GetData(), size));
   return base::UTF16ToUTF8(value);
 }
 
 }  // namespace
 
 bool InitializeSDK() {
-  FPDF_InitLibrary();
+  FPDF_LIBRARY_CONFIG config;
+  config.version = 2;
+  config.m_pUserFontPaths = nullptr;
+  config.m_pIsolate = v8::Isolate::GetCurrent();

[Tom Sepez, 2015/10/03 01:07:13]

What do we give up if we pass a nullptr here, forcing each runtime to have its
own isolate, as a last-ditch effort to get the thing out the door?

[Lei Zhang, 2015/10/03 01:09:05]

Possibly just giving up some efficiency, but locally I'm having trouble testing
the website for the bug even without this CL.

+  config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
+  FPDF_InitLibraryWithConfig(&config);
 
 #if defined(OS_LINUX)
   // Font loading doesn't work in the renderer sandbox in Linux.
   FPDF_SetSystemFontInfo(&g_font_info);
 #endif
 
   FSDK_SetUnSpObjProcessHandler(&g_unsuppored_info);
 
   return true;
 }
@@ skipping 78 matching lines @@
   FPDF_FORMFILLINFO::FFI_GetPlatform = Form_GetPlatform;
   FPDF_FORMFILLINFO::FFI_PopupMenu = Form_PopupMenu;
   FPDF_FORMFILLINFO::FFI_PostRequestURL = Form_PostRequestURL;
   FPDF_FORMFILLINFO::FFI_PutRequestURL = Form_PutRequestURL;
   FPDF_FORMFILLINFO::FFI_UploadTo = Form_UploadTo;
   FPDF_FORMFILLINFO::FFI_DownloadFromURL = Form_DownloadFromURL;
   FPDF_FORMFILLINFO::FFI_OpenFile = Form_OpenFile;
   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;
   IPDF_JSPLATFORM::Doc_getFilePath = Form_GetFilePath;
   IPDF_JSPLATFORM::Doc_mail = Form_Mail;
   IPDF_JSPLATFORM::Doc_print = Form_Print;
   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;
   IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
 }
 
 PDFiumEngine::~PDFiumEngine() {
   for (size_t i = 0; i < pages_.size(); ++i)
     pages_[i]->Unload();
 
@@ skipping 3370 matching lines @@
     double* height) {
   FPDF_DOCUMENT doc = FPDF_LoadMemDocument(pdf_buffer, pdf_buffer_size, NULL);
   if (!doc)
     return false;
   bool success = FPDF_GetPageSizeByIndex(doc, page_number, width, height) != 0;
   FPDF_CloseDocument(doc);
   return success;
 }
 
 }  // namespace chrome_pdf