diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-02-06 19:29:36 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-02-06 19:29:36 +0000 |
| commit | 8d28aa8db0c717bef863b7a7630f48cf3870ffb1 (patch) | |
| tree | ae8b6c930932585d45e586480457898519baa1ce /www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc | |
| parent | Upgrade to 0.11.0 (diff) | |
www/chromium: update to 56.0.2924.87
- Use system FFmpeg instead of embedded code copy [1]
- Disable PULSEAUDIO option [2]
- Sort _DEPENDS variables
- Regenerate patches with make makepatch
PR: 215271 [1], 216327 [2]
Reported by: jbeich [1]
Approved by: rene
MFH: 2017Q1
Security: https://vuxml.freebsd.org/freebsd/4b9ca994-e3d9-11e6-813d-e8e0b747a45a.html
Diffstat (limited to 'www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc')
| -rw-r--r-- | www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index a8d317b11894..29a00a2f4d8d 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2016-05-11 19:02:25 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2017-01-26 00:49:16 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -121,7 +121,7 @@ std::vector<uint32_t> GetPageNumbersFrom +@@ -127,7 +127,7 @@ std::vector<uint32_t> GetPageNumbersFrom return page_numbers; } @@ -9,7 +9,7 @@ PP_Instance g_last_instance_id; -@@ -507,7 +507,7 @@ bool InitializeSDK() { +@@ -629,7 +629,7 @@ bool InitializeSDK() { config.m_v8EmbedderSlot = gin::kEmbedderPDFium; FPDF_InitLibraryWithConfig(&config); @@ -17,8 +17,17 @@ +#if defined(OS_LINUX) || defined(OS_BSD) // Font loading doesn't work in the renderer sandbox in Linux. FPDF_SetSystemFontInfo(&g_font_info); + #else +@@ -654,7 +654,7 @@ bool InitializeSDK() { + + void ShutdownSDK() { + FPDF_DestroyLibrary(); +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + delete g_font_info; #endif -@@ -620,7 +620,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl + TearDownV8(); +@@ -758,7 +758,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; @@ -27,7 +36,7 @@ // PreviewModeClient does not know its pp::Instance. pp::Instance* instance = client_->GetPluginInstance(); if (instance) -@@ -1330,7 +1330,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA +@@ -1510,7 +1510,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA FPDF_ClosePage(pdf_page); } @@ -36,7 +45,7 @@ g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -2688,7 +2688,7 @@ bool PDFiumEngine::ContinuePaint(int pro +@@ -2919,7 +2919,7 @@ bool PDFiumEngine::ContinuePaint(int pro DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size()); DCHECK(image_data); @@ -45,7 +54,7 @@ g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -3142,7 +3142,7 @@ void PDFiumEngine::SetCurrentPage(int in +@@ -3377,7 +3377,7 @@ void PDFiumEngine::SetCurrentPage(int in FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; |