summaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc')
-rw-r--r--www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc39
1 files changed, 24 insertions, 15 deletions
diff --git a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
index 832fa36bbab4..bb4fd053ed0d 100644
--- a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,15 +1,24 @@
---- pdf/pdfium/pdfium_engine.cc.orig 2018-05-09 21:05:54.000000000 +0200
-+++ pdf/pdfium/pdfium_engine.cc 2018-08-16 11:32:37.234026000 +0200
-@@ -165,7 +165,7 @@
- return page_numbers;
- }
+--- pdf/pdfium/pdfium_engine.cc.orig 2019-03-11 22:01:01 UTC
++++ pdf/pdfium/pdfium_engine.cc
+@@ -133,7 +133,7 @@ constexpr base::TimeDelta kMaxInitialProgressivePaintT
+
+ PDFiumEngine* g_engine_for_fontmapper = nullptr;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
PP_Instance g_last_instance_id;
-@@ -717,7 +717,7 @@
+@@ -413,7 +413,7 @@ void Release(FPDF_SYSFONTINFO* sysfontinfo) {
+ fontinfo_with_metrics->default_sysfontinfo->Release(
+ fontinfo_with_metrics->default_sysfontinfo);
+ }
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ PDFiumEngine::CreateDocumentLoaderFunction
+ g_create_document_loader_for_testing = nullptr;
+@@ -663,7 +663,7 @@ bool InitializeSDK() {
config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
FPDF_InitLibraryWithConfig(&config);
@@ -18,7 +27,7 @@
// Font loading doesn't work in the renderer sandbox in Linux.
FPDF_SetSystemFontInfo(&g_font_info);
#else
-@@ -742,7 +742,7 @@
+@@ -688,7 +688,7 @@ bool InitializeSDK() {
void ShutdownSDK() {
FPDF_DestroyLibrary();
@@ -27,7 +36,7 @@
delete g_font_info;
#endif
TearDownV8();
-@@ -844,7 +844,7 @@
+@@ -712,7 +712,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client,
IFSDK_PAUSE::user = nullptr;
IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
@@ -36,26 +45,26 @@
// PreviewModeClient does not know its pp::Instance.
pp::Instance* instance = client_->GetPluginInstance();
if (instance)
-@@ -1660,7 +1660,7 @@
- FPDF_ClosePage(pdf_page);
- }
+@@ -1176,7 +1176,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
+
+ KillFormFocus();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
g_last_instance_id = client_->GetPluginInstance()->pp_instance();
#endif
-@@ -3409,7 +3409,7 @@
- DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size());
+@@ -2973,7 +2973,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
DCHECK(image_data);
+ last_progressive_start_time_ = base::Time::Now();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
g_last_instance_id = client_->GetPluginInstance()->pp_instance();
#endif
-@@ -3872,7 +3872,7 @@
- FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE);
+@@ -3448,7 +3448,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
+ FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE);
}
most_visible_page_ = index;
-#if defined(OS_LINUX)