bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 65.0.3325.181

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-03-26 17:00:11 -04:00
parent aabe4c4cfc
commit e5b78a54cf
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/65.0.3325.146', 'chromium_checkout': 'refs/tags/65.0.3325.181',
} }

17
libcef/browser/printing/print_view_manager_base.cc
View File

@@ -120,6 +120,11 @@ void CefPrintViewManagerBase::PrintDocument(
print_job_->StartPdfToEmfConversion(print_data, page_size, content_area, print_job_->StartPdfToEmfConversion(print_data, page_size, content_area,
print_text_with_gdi); print_text_with_gdi);
} }
// Indicate that the PDF is fully rendered and we no longer need the renderer
// and web contents, so the print job does not need to be cancelled if they
// die. This is needed on Windows because the PrintedDocument will not be
// considered complete until PDF conversion finishes.
document->SetConvertingPdf();
#else #else
std::unique_ptr<PdfMetafileSkia> metafile = std::unique_ptr<PdfMetafileSkia> metafile =
std::make_unique<PdfMetafileSkia>(SkiaDocumentType::PDF); std::make_unique<PdfMetafileSkia>(SkiaDocumentType::PDF);
@@ -346,18 +351,18 @@ bool CefPrintViewManagerBase::RenderAllMissingPagesNow() {
if (!print_job_.get() || !print_job_->is_job_pending()) if (!print_job_.get() || !print_job_->is_job_pending())
return false; return false;
// We can't print if there is no renderer.
if (!web_contents() || !web_contents()->GetRenderViewHost() ||
!web_contents()->GetRenderViewHost()->IsRenderViewLive()) {
return false;
}
// Is the document already complete? // Is the document already complete?
if (print_job_->document() && print_job_->document()->IsComplete()) { if (print_job_->document() && print_job_->document()->IsComplete()) {
printing_succeeded_ = true; printing_succeeded_ = true;
return true; return true;
} }
// We can't print if there is no renderer.
if (!web_contents() || !web_contents()->GetRenderViewHost() ||
!web_contents()->GetRenderViewHost()->IsRenderViewLive()) {
return false;
}
// WebContents is either dying or a second consecutive request to print // WebContents is either dying or a second consecutive request to print
// happened before the first had time to finish. We need to render all the // happened before the first had time to finish. We need to render all the
// pages in an hurry if a print_job_ is still pending. No need to wait for it // pages in an hurry if a print_job_ is still pending. No need to wait for it