mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: headless job tracking in printToPDF (#36046)

Browse source
This commit is contained in:
Shelley Vohr 2022-10-18 06:46:19 -07:00 • committed by GitHub
parent b13606e55d
commit a8d89b3d52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
shell/browser/printing/print_view_manager_electron.cc
View file

@ -126,6 +126,7 @@ void PrintViewManagerElectron::PrintToPdf(
printing_rfh_ = rfh; printing_rfh_ = rfh;
print_pages_params->pages = absl::get<printing::PageRanges>(parsed_ranges); print_pages_params->pages = absl::get<printing::PageRanges>(parsed_ranges);
headless_jobs_.emplace_back(print_pages_params->params->document_cookie);
callback_ = std::move(callback); callback_ = std::move(callback);
// There is no need for a weak pointer here since the mojo proxy is held // There is no need for a weak pointer here since the mojo proxy is held
@ -152,7 +153,9 @@ void PrintViewManagerElectron::OnDidPrintWithParams(
} }
} }
auto& content = *result->get_params()->content; printing::mojom::DidPrintDocumentParamsPtr& params = result->get_params();
auto& content = *params->content;
if (!content.metafile_data_region.IsValid()) { if (!content.metafile_data_region.IsValid()) {
FailJob(kInvalidMemoryHandle); FailJob(kInvalidMemoryHandle);
return; return;
@ -168,7 +171,7 @@ void PrintViewManagerElectron::OnDidPrintWithParams(
std::string(static_cast<const char*>(map.memory()), map.size()); std::string(static_cast<const char*>(map.memory()), map.size());
std::move(callback_).Run(kPrintSuccess, std::move(callback_).Run(kPrintSuccess,
base::RefCountedString::TakeString(&data)); base::RefCountedString::TakeString(&data));
base::Erase(headless_jobs_, params->document_cookie);
Reset(); Reset();
} }