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

Merge pull request #6761 from bbondy/master

Browse source 
Fix printing on Windows when sandbox is enabled
This commit is contained in:
Cheng Zhao 2016-08-08 16:52:07 +09:00 committed by GitHub
commit 850ea37abd
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
View file

@ -113,6 +113,7 @@ bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame,
printed_page_params.content_area = content_area_in_dpi[i]; printed_page_params.content_area = content_area_in_dpi[i];
Send(new PrintHostMsg_DidPrintPage(routing_id(), printed_page_params)); Send(new PrintHostMsg_DidPrintPage(routing_id(), printed_page_params));
// Send the rest of the pages with an invalid metafile handle. // Send the rest of the pages with an invalid metafile handle.
printed_page_params.metafile_data_handle.Close();
printed_page_params.metafile_data_handle = base::SharedMemoryHandle(); printed_page_params.metafile_data_handle = base::SharedMemoryHandle();
} }
return true; return true;
@ -198,22 +199,19 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem(
if (buf_size == 0) if (buf_size == 0)
return false; return false;
base::SharedMemory shared_buf; std::unique_ptr<base::SharedMemory> shared_buf(
// Allocate a shared memory buffer to hold the generated metafile data. content::RenderThread::Get()->HostAllocateSharedMemoryBuffer(buf_size));
if (!shared_buf.CreateAndMapAnonymous(buf_size)) if (!shared_buf)
return false; return false;
// Copy the bits into shared memory. if (!shared_buf->Map(buf_size))
if (!metafile.GetData(shared_buf.memory(), buf_size))
return false; return false;
if (!shared_buf.GiveToProcess(base::GetCurrentProcessHandle(), if (!metafile.GetData(shared_buf->memory(), buf_size))
shared_mem_handle)) {
return false; return false;
}
Send(new PrintHostMsg_DuplicateSection(routing_id(), *shared_mem_handle, *shared_mem_handle =
shared_mem_handle)); base::SharedMemory::DuplicateHandle(shared_buf->handle());
return true; return true;
} }