Skip to content

GitLab

T
tangled
Commit 57726dc8 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot
Browse files
Options

Remove PdfCompositor.CompositePageToPdf's page_num parameter. 

It is only used in unit tests. Similarly remove the frame GUID.

Change-Id: Idb9bf8f53ce825ea27cfc638ccd437c17e2b0e6f
Reviewed-on: https://chromium-review.googlesource.com/c/1308075
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: default avatarWei Li <weili@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604290}
parent 827328d9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 105 deletions
chrome/browser/printing/print_preview_message_handler.cc
View file @ 57726dc8
......@@ -165,7 +165,7 @@ void PrintPreviewMessageHandler::OnDidPreviewPage(
// Use utility process to convert skia metafile to pdf.
client->DoCompositePageToPdf(
params.document_cookie, render_frame_host, page_number, content,
params.document_cookie, render_frame_host, content,
base::BindOnce(&PrintPreviewMessageHandler::OnCompositePdfPageDone,
weak_ptr_factory_.GetWeakPtr(), page_number,
params.document_cookie, ids));
......
components/printing/browser/print_composite_client.cc
View file @ 57726dc8
......@@ -167,7 +167,6 @@ void PrintCompositeClient::PrintCrossProcessSubframe(
void PrintCompositeClient::DoCompositePageToPdf(
int document_cookie,
content::RenderFrameHost* render_frame_host,
int page_num,
const PrintHostMsg_DidPrintContent_Params& content,
mojom::PdfCompositor::CompositePageToPdfCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
......@@ -175,7 +174,7 @@ void PrintCompositeClient::DoCompositePageToPdf(
auto& compositor = GetCompositeRequest(document_cookie);
auto region = content.metafile_data_region.Duplicate();
compositor->CompositePageToPdf(
GenerateFrameGuid(render_frame_host), page_num, std::move(region),
GenerateFrameGuid(render_frame_host), std::move(region),
ConvertContentInfoMap(render_frame_host, content.subframe_content_info),
base::BindOnce(&PrintCompositeClient::OnDidCompositePageToPdf,
std::move(callback)));
......
components/printing/browser/print_composite_client.h
View file @ 57726dc8
......@@ -56,7 +56,6 @@ class PrintCompositeClient
void DoCompositePageToPdf(
int cookie,
content::RenderFrameHost* render_frame_host,
int page_num,
const PrintHostMsg_DidPrintContent_Params& content,
mojom::PdfCompositor::CompositePageToPdfCallback callback);
......
components/services/pdf_compositor/pdf_compositor_impl.cc
View file @ 57726dc8
......@@ -85,11 +85,10 @@ void PdfCompositorImpl::AddSubframeContent(
void PdfCompositorImpl::CompositePageToPdf(
uint64_t frame_guid,
uint32_t page_num,
base::ReadOnlySharedMemoryRegion serialized_content,
const ContentToFrameMap& subframe_content_map,
mojom::PdfCompositor::CompositePageToPdfCallback callback) {
HandleCompositionRequest(frame_guid, page_num, std::move(serialized_content),
HandleCompositionRequest(frame_guid, std::move(serialized_content),
subframe_content_map, std::move(callback));
}
......@@ -98,9 +97,8 @@ void PdfCompositorImpl::CompositeDocumentToPdf(
base::ReadOnlySharedMemoryRegion serialized_content,
const ContentToFrameMap& subframe_content_map,
mojom::PdfCompositor::CompositeDocumentToPdfCallback callback) {
HandleCompositionRequest(frame_guid, base::nullopt,
std::move(serialized_content), subframe_content_map,
std::move(callback));
HandleCompositionRequest(frame_guid, std::move(serialized_content),
subframe_content_map, std::move(callback));
}
void PdfCompositorImpl::SetWebContentsURL(const GURL& url) {
......@@ -125,8 +123,7 @@ void PdfCompositorImpl::UpdateRequestsWithSubframeInfo(
if (pending_list.empty()) {
// If the request isn't waiting on any subframes then it is ready.
// Fulfill the request now.
FulfillRequest(request->frame_guid, request->page_number,
std::move(request->serialized_content),
FulfillRequest(std::move(request->serialized_content),
request->subframe_content_map,
std::move(request->callback));
it = requests_.erase(it);
......@@ -171,7 +168,6 @@ void PdfCompositorImpl::CheckFramesForReadiness(
void PdfCompositorImpl::HandleCompositionRequest(
uint64_t frame_guid,
base::Optional<uint32_t> page_num,
base::ReadOnlySharedMemoryRegion serialized_content,
const ContentToFrameMap& subframe_content_map,
CompositeToPdfCallback callback) {
......@@ -186,8 +182,8 @@ void PdfCompositorImpl::HandleCompositionRequest(
base::flat_set<uint64_t> pending_subframes;
if (IsReadyToComposite(frame_guid, subframe_content_map,
&pending_subframes)) {
FulfillRequest(frame_guid, page_num, std::move(mapping),
subframe_content_map, std::move(callback));
FulfillRequest(std::move(mapping), subframe_content_map,
std::move(callback));
return;
}
......@@ -198,13 +194,11 @@ void PdfCompositorImpl::HandleCompositionRequest(
frame_info_map_[frame_guid] = std::make_unique<FrameInfo>();
requests_.push_back(std::make_unique<RequestInfo>(
frame_guid, page_num, std::move(mapping), subframe_content_map,
std::move(pending_subframes), std::move(callback)));
std::move(mapping), subframe_content_map, std::move(pending_subframes),
std::move(callback)));
}
mojom::PdfCompositor::Status PdfCompositorImpl::CompositeToPdf(
uint64_t frame_guid,
base::Optional<uint32_t> page_num,
base::ReadOnlySharedMemoryMapping shared_mem,
const ContentToFrameMap& subframe_content_map,
base::ReadOnlySharedMemoryRegion* region) {
......@@ -287,15 +281,12 @@ PdfCompositorImpl::GetDeserializationContext(
}
void PdfCompositorImpl::FulfillRequest(
uint64_t frame_guid,
base::Optional<uint32_t> page_num,
base::ReadOnlySharedMemoryMapping serialized_content,
const ContentToFrameMap& subframe_content_map,
CompositeToPdfCallback callback) {
base::ReadOnlySharedMemoryRegion region;
auto status =
CompositeToPdf(frame_guid, page_num, std::move(serialized_content),
subframe_content_map, &region);
auto status = CompositeToPdf(std::move(serialized_content),
subframe_content_map, &region);
std::move(callback).Run(status, std::move(region));
}
......@@ -313,15 +304,11 @@ PdfCompositorImpl::FrameInfo::FrameInfo() {}
PdfCompositorImpl::FrameInfo::~FrameInfo() {}
PdfCompositorImpl::RequestInfo::RequestInfo(
uint64_t frame_guid,
base::Optional<uint32_t> page_num,
base::ReadOnlySharedMemoryMapping content,
const ContentToFrameMap& content_info,
const base::flat_set<uint64_t>& pending_subframes,
mojom::PdfCompositor::CompositePageToPdfCallback callback)
: FrameContentInfo(std::move(content), content_info),
frame_guid(frame_guid),
page_number(page_num),
pending_subframes(pending_subframes),
callback(std::move(callback)) {}
......
components/services/pdf_compositor/pdf_compositor_impl.h
View file @ 57726dc8
......@@ -39,7 +39,6 @@ class PdfCompositorImpl : public mojom::PdfCompositor {
const ContentToFrameMap& subframe_content_map) override;
void CompositePageToPdf(
uint64_t frame_guid,
uint32_t page_num,
base::ReadOnlySharedMemoryRegion serialized_content,
const ContentToFrameMap& subframe_content_map,
mojom::PdfCompositor::CompositePageToPdfCallback callback) override;
......@@ -60,8 +59,6 @@ class PdfCompositorImpl : public mojom::PdfCompositor {
// Make this function virtual so tests can override it.
virtual void FulfillRequest(
uint64_t frame_guid,
base::Optional<uint32_t> page_num,
base::ReadOnlySharedMemoryMapping serialized_content,
const ContentToFrameMap& subframe_content_map,
CompositeToPdfCallback callback);
......@@ -110,17 +107,12 @@ class PdfCompositorImpl : public mojom::PdfCompositor {
// Stores the page or document's request information.
struct RequestInfo : public FrameContentInfo {
RequestInfo(uint64_t frame_guid,
base::Optional<uint32_t> page_num,
base::ReadOnlySharedMemoryMapping content,
RequestInfo(base::ReadOnlySharedMemoryMapping content,
const ContentToFrameMap& content_info,
const base::flat_set<uint64_t>& pending_subframes,
CompositeToPdfCallback callback);
~RequestInfo();
uint64_t frame_guid;
base::Optional<uint32_t> page_number;
// All pending frame ids whose content is not available but needed
// for composition.
base::flat_set<uint64_t> pending_subframes;
......@@ -151,15 +143,12 @@ class PdfCompositorImpl : public mojom::PdfCompositor {
// requests.
void HandleCompositionRequest(
uint64_t frame_guid,
base::Optional<uint32_t> page_num,
base::ReadOnlySharedMemoryRegion serialized_content,
const ContentToFrameMap& subframe_content_ids,
CompositeToPdfCallback callback);
// The core function for content composition and conversion to a pdf file.
mojom::PdfCompositor::Status CompositeToPdf(
uint64_t frame_guid,
base::Optional<uint32_t> page_num,
base::ReadOnlySharedMemoryMapping shared_mem,
const ContentToFrameMap& subframe_content_map,
base::ReadOnlySharedMemoryRegion* region);
......
components/services/pdf_compositor/public/interfaces/pdf_compositor.mojom
View file @ 57726dc8
......@@ -39,12 +39,11 @@ interface PdfCompositor {
// Requests to composite a page and convert it into a PDF file.
// |frame_guid| is the global unique id of the frame to be composited.
// |page_num| is zero-based sequence number of page.
// |sk_region| is a buffer of a Skia MultiPictureDocument which has
// the drawing content of this frame or a page of this frame.
// |subframe_content_map| records content id and its corresponding frame's
// global unique id.
CompositePageToPdf(uint64 frame_guid, uint32 page_num,
CompositePageToPdf(uint64 frame_guid,
mojo_base.mojom.ReadOnlySharedMemoryRegion sk_region,
map<uint32, uint64> subframe_content_info)
=> (Status status,
......
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