diff --git a/components/services/print_compositor/print_compositor_impl.cc b/components/services/print_compositor/print_compositor_impl.cc index 4e549b9b00dd3d..9da9b63a2aa12e 100644 --- a/components/services/print_compositor/print_compositor_impl.cc +++ b/components/services/print_compositor/print_compositor_impl.cc @@ -358,8 +358,8 @@ mojom::PrintCompositor::Status PrintCompositorImpl::CompositeToPdf( return mojom::PrintCompositor::Status::kHandleMapError; } - DeserializationContext subframes = - GetDeserializationContext(subframe_content_map); + PictureDeserializationContext subframes = + GetPictureDeserializationContext(subframe_content_map); // Read in content and convert it into pdf. SkMemoryStream stream(shared_mem.memory(), shared_mem.size()); @@ -418,8 +418,8 @@ void PrintCompositorImpl::CompositeSubframe(FrameInfo* frame_info) { frame_info->composited = true; // Composite subframes first. - DeserializationContext subframes = - GetDeserializationContext(frame_info->subframe_content_map); + PictureDeserializationContext subframes = + GetPictureDeserializationContext(frame_info->subframe_content_map); // Composite the entire frame. SkMemoryStream stream(frame_info->serialized_content.memory(), @@ -428,10 +428,10 @@ void PrintCompositorImpl::CompositeSubframe(FrameInfo* frame_info) { frame_info->content = SkPicture::MakeFromStream(&stream, &procs); } -PrintCompositorImpl::DeserializationContext -PrintCompositorImpl::GetDeserializationContext( +PrintCompositorImpl::PictureDeserializationContext +PrintCompositorImpl::GetPictureDeserializationContext( const ContentToFrameMap& subframe_content_map) { - DeserializationContext subframes; + PictureDeserializationContext subframes; for (auto& content_info : subframe_content_map) { uint32_t content_id = content_info.first; uint64_t frame_guid = content_info.second; diff --git a/components/services/print_compositor/print_compositor_impl.h b/components/services/print_compositor/print_compositor_impl.h index 9d1d68256b33cf..c1d92bc675f337 100644 --- a/components/services/print_compositor/print_compositor_impl.h +++ b/components/services/print_compositor/print_compositor_impl.h @@ -123,7 +123,8 @@ class PrintCompositorImpl : public mojom::PrintCompositor { // The map needed during content deserialization. It stores the mapping // between content id and its actual content. - using DeserializationContext = base::flat_map>; + using PictureDeserializationContext = + base::flat_map>; // Base structure to store a frame's content and its subframe // content information. @@ -218,7 +219,7 @@ class PrintCompositorImpl : public mojom::PrintCompositor { // Composite the content of a subframe. void CompositeSubframe(FrameInfo* frame_info); - DeserializationContext GetDeserializationContext( + PictureDeserializationContext GetPictureDeserializationContext( const ContentToFrameMap& subframe_content_map); mojo::Receiver receiver_{this}; diff --git a/printing/common/metafile_utils.cc b/printing/common/metafile_utils.cc index 9dd15e588272f3..3cdcf3fd414f62 100644 --- a/printing/common/metafile_utils.cc +++ b/printing/common/metafile_utils.cc @@ -233,7 +233,7 @@ sk_sp DeserializeOopPicture(const void* data, } memcpy(&pic_id, data, sizeof(pic_id)); - auto* context = reinterpret_cast(ctx); + auto* context = reinterpret_cast(ctx); auto iter = context->find(pic_id); if (iter == context->end() || !iter->second) { // When we don't have the out-of-process picture available, we return @@ -244,17 +244,18 @@ sk_sp DeserializeOopPicture(const void* data, return iter->second; } -SkSerialProcs SerializationProcs(SerializationContext* ctx) { +SkSerialProcs SerializationProcs(PictureSerializationContext* picture_ctx) { SkSerialProcs procs; procs.fPictureProc = SerializeOopPicture; - procs.fPictureCtx = ctx; + procs.fPictureCtx = picture_ctx; return procs; } -SkDeserialProcs DeserializationProcs(DeserializationContext* ctx) { +SkDeserialProcs DeserializationProcs( + PictureDeserializationContext* picture_ctx) { SkDeserialProcs procs; procs.fPictureProc = DeserializeOopPicture; - procs.fPictureCtx = ctx; + procs.fPictureCtx = picture_ctx; return procs; } diff --git a/printing/common/metafile_utils.h b/printing/common/metafile_utils.h index 5a8fb274bb176e..e6779d6168d53a 100644 --- a/printing/common/metafile_utils.h +++ b/printing/common/metafile_utils.h @@ -20,19 +20,21 @@ namespace printing { using ContentToProxyIdMap = base::flat_map; // Stores the mapping between a content's unique id and its actual content. -using DeserializationContext = base::flat_map>; +using PictureDeserializationContext = + base::flat_map>; // Stores the mapping between content's unique id and its corresponding frame // proxy id. -using SerializationContext = ContentToProxyIdMap; +using PictureSerializationContext = ContentToProxyIdMap; sk_sp MakePdfDocument(const std::string& creator, const ui::AXTreeUpdate& accessibility_tree, SkWStream* stream); -SkSerialProcs SerializationProcs(SerializationContext* ctx); +SkSerialProcs SerializationProcs(PictureSerializationContext* picture_ctx); -SkDeserialProcs DeserializationProcs(DeserializationContext* ctx); +SkDeserialProcs DeserializationProcs( + PictureDeserializationContext* picture_ctx); } // namespace printing diff --git a/printing/metafile_skia_unittest.cc b/printing/metafile_skia_unittest.cc index 6d2528bf168486..af6c43c45c03a4 100644 --- a/printing/metafile_skia_unittest.cc +++ b/printing/metafile_skia_unittest.cc @@ -53,7 +53,7 @@ TEST(MetafileSkiaTest, TestFrameContent) { EXPECT_TRUE(picture); // Get the complete picture by replacing the placeholder. - DeserializationContext subframes; + PictureDeserializationContext subframes; subframes[content_id] = picture; SkDeserialProcs procs = DeserializationProcs(&subframes); sk_sp pic = SkPicture::MakeFromStream(metafile_stream, &procs);