Commit e3494791 authored by Alan Screen's avatar Alan Screen Committed by Commit Bot

Cleanup: make CopyMetafileDataToReadOnlySharedMem anonymous

Routine isn't needed by platform implementations, so can be safely made
anonymous.

Simplification that came out of larger crrev.com/c/1616461.

Bug: 872935
Change-Id: I9a17edc72ad2222d31968e9bcaeebdb932eda4ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1869375Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Alan Screen <awscreen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707840}
parent 3a374eef
...@@ -614,6 +614,26 @@ void RecordSiteIsolationPrintMetrics(blink::WebFrame* printed_frame) { ...@@ -614,6 +614,26 @@ void RecordSiteIsolationPrintMetrics(blink::WebFrame* printed_frame) {
cross_site_visible_frame_count); cross_site_visible_frame_count);
} }
bool CopyMetafileDataToReadOnlySharedMem(
const MetafileSkia& metafile,
PrintHostMsg_DidPrintContent_Params* params) {
uint32_t buf_size = metafile.GetDataSize();
if (buf_size == 0)
return false;
base::MappedReadOnlyRegion region_mapping =
mojo::CreateReadOnlySharedMemoryRegion(buf_size);
if (!region_mapping.IsValid())
return false;
if (!metafile.GetData(region_mapping.mapping.memory(), buf_size))
return false;
params->metafile_data_region = std::move(region_mapping.region);
params->subframe_content_info = metafile.GetSubframeContentInfo();
return true;
}
} // namespace } // namespace
FrameReference::FrameReference(blink::WebLocalFrame* frame) { FrameReference::FrameReference(blink::WebLocalFrame* frame) {
...@@ -2169,26 +2189,6 @@ void PrintRenderFrameHelper::PrintPageInternal( ...@@ -2169,26 +2189,6 @@ void PrintRenderFrameHelper::PrintPageInternal(
} }
#endif // !defined(OS_MACOSX) #endif // !defined(OS_MACOSX)
bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem(
const MetafileSkia& metafile,
PrintHostMsg_DidPrintContent_Params* params) {
uint32_t buf_size = metafile.GetDataSize();
if (buf_size == 0)
return false;
base::MappedReadOnlyRegion region_mapping =
mojo::CreateReadOnlySharedMemoryRegion(buf_size);
if (!region_mapping.IsValid())
return false;
if (!metafile.GetData(region_mapping.mapping.memory(), buf_size))
return false;
params->metafile_data_region = std::move(region_mapping.region);
params->subframe_content_info = metafile.GetSubframeContentInfo();
return true;
}
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
void PrintRenderFrameHelper::ShowScriptedPrintPreview() { void PrintRenderFrameHelper::ShowScriptedPrintPreview() {
if (is_scripted_preview_delayed_) { if (is_scripted_preview_delayed_) {
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
struct PrintMsg_Print_Params; struct PrintMsg_Print_Params;
struct PrintMsg_PrintPages_Params; struct PrintMsg_PrintPages_Params;
struct PrintMsg_PrintFrame_Params; struct PrintMsg_PrintFrame_Params;
struct PrintHostMsg_DidPrintContent_Params;
struct PrintHostMsg_SetOptionsFromDocument_Params; struct PrintHostMsg_SetOptionsFromDocument_Params;
// RenderViewTest-based tests crash on Android // RenderViewTest-based tests crash on Android
...@@ -340,10 +339,6 @@ class PrintRenderFrameHelper ...@@ -340,10 +339,6 @@ class PrintRenderFrameHelper
// Helper methods ----------------------------------------------------------- // Helper methods -----------------------------------------------------------
bool CopyMetafileDataToReadOnlySharedMem(
const MetafileSkia& metafile,
PrintHostMsg_DidPrintContent_Params* params);
// Increments the IPC nesting level when an IPC message is received. // Increments the IPC nesting level when an IPC message is received.
void IPCReceived(); void IPCReceived();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment