Add printing RequestedMedia mojo type with mapping

Print driver settings queries and document printing with the print backend service requires the ability to transfer PrintSettings over Mojo. This requires types used by its members to also be mojoified. Add a mojo definition for printing::PrintSettings::RequestedMedia as part of the overall mojofication for PrintSettings. This is an update to what was previously landed (and reverted) in https://crrev.com/910002 with updates to the build file dependencies to avoid a build race condition. Bug: 809738 Change-Id: I4a68b7cc9e66e0dc31763995dc86ca04c7e420a2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3089514 Reviewed-by: Lei Zhang <thestig@chromium.org> Reviewed-by: Robert Sesek <rsesek@chromium.org> Commit-Queue: Alan Screen <awscreen@chromium.org> Cr-Commit-Position: refs/heads/master@{#911022}
FairyWorld · Aug 11, 2021 · 1c9d967 · 1c9d967
1 parent 91ec1c4
commit 1c9d967
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 23 deletions.
diff --git a/printing/mojom/BUILD.gn b/printing/mojom/BUILD.gn
@@ -3,34 +3,45 @@
 # found in the LICENSE file.
 
 import("//mojo/public/tools/bindings/mojom.gni")
+import("//printing/buildflags/buildflags.gni")
 
 mojom("mojom") {
   sources = [ "print.mojom" ]
 }
 
-mojom("printing_context") {
-  sources = [ "printing_context.mojom" ]
+if (enable_basic_printing) {
+  mojom("printing_context") {
+    sources = [ "printing_context.mojom" ]
 
-  deps = [ "//ui/gfx/geometry/mojom" ]
+    public_deps = [ "//ui/gfx/geometry/mojom" ]
 
-  cpp_typemaps = [
-    {
-      types = [
-        {
-          mojom = "printing.mojom.PageMargins"
-          cpp = "::printing::PageMargins"
-        },
-        {
-          mojom = "printing.mojom.PageSetup"
-          cpp = "::printing::PageSetup"
-        },
-        {
-          mojom = "printing.mojom.PageRange"
-          cpp = "::printing::PageRange"
-        },
-      ]
-      traits_sources = [ "printing_context_mojom_traits.cc" ]
-      traits_headers = [ "printing_context_mojom_traits.h" ]
-    },
-  ]
+    cpp_typemaps = [
+      {
+        types = [
+          {
+            mojom = "printing.mojom.PageMargins"
+            cpp = "::printing::PageMargins"
+          },
+          {
+            mojom = "printing.mojom.PageSetup"
+            cpp = "::printing::PageSetup"
+          },
+          {
+            mojom = "printing.mojom.PageRange"
+            cpp = "::printing::PageRange"
+          },
+          {
+            mojom = "printing.mojom.RequestedMedia"
+            cpp = "::printing::PrintSettings::RequestedMedia"
+          },
+        ]
+        traits_sources = [ "printing_context_mojom_traits.cc" ]
+        traits_headers = [ "printing_context_mojom_traits.h" ]
+        traits_deps = [
+          "//printing",
+          "//ui/gfx/geometry",
+        ]
+      },
+    ]
+  }
 }
diff --git a/printing/mojom/printing_context.mojom b/printing/mojom/printing_context.mojom
@@ -33,3 +33,10 @@ struct PageRange {
   uint32 from;
   uint32 to;
 };
+
+// Corresponds to `printing::PrintSettings::RequestedMedia` in
+// printing/print_settings.h.
+struct RequestedMedia {
+  gfx.mojom.Size size_microns;
+  string vendor_id;
+};
diff --git a/printing/mojom/printing_context_mojom_traits.cc b/printing/mojom/printing_context_mojom_traits.cc
@@ -70,4 +70,13 @@ bool StructTraits<printing::mojom::PageRangeDataView, printing::PageRange>::
   return true;
 }
 
+// static
+bool StructTraits<printing::mojom::RequestedMediaDataView,
+                  printing::PrintSettings::RequestedMedia>::
+    Read(printing::mojom::RequestedMediaDataView data,
+         printing::PrintSettings::RequestedMedia* out) {
+  return data.ReadSizeMicrons(&out->size_microns) &&
+         data.ReadVendorId(&out->vendor_id);
+}
+
 }  // namespace mojo
diff --git a/printing/mojom/printing_context_mojom_traits.h b/printing/mojom/printing_context_mojom_traits.h
@@ -8,6 +8,7 @@
 #include "printing/mojom/printing_context.mojom-shared.h"
 #include "printing/page_range.h"
 #include "printing/page_setup.h"
+#include "printing/print_settings.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace mojo {
@@ -68,6 +69,22 @@ struct StructTraits<printing::mojom::PageRangeDataView, printing::PageRange> {
                    printing::PageRange* out);
 };
 
+template <>
+struct StructTraits<printing::mojom::RequestedMediaDataView,
+                    printing::PrintSettings::RequestedMedia> {
+  static const gfx::Size& size_microns(
+      const printing::PrintSettings::RequestedMedia& r) {
+    return r.size_microns;
+  }
+  static const std::string& vendor_id(
+      const printing::PrintSettings::RequestedMedia& r) {
+    return r.vendor_id;
+  }
+
+  static bool Read(printing::mojom::RequestedMediaDataView data,
+                   printing::PrintSettings::RequestedMedia* out);
+};
+
 }  // namespace mojo
 
 #endif  // PRINTING_MOJOM_PRINTING_CONTEXT_MOJOM_TRAITS_H_
diff --git a/printing/mojom/printing_context_mojom_traits_unittest.cc b/printing/mojom/printing_context_mojom_traits_unittest.cc
@@ -6,6 +6,7 @@
 #include "printing/mojom/printing_context.mojom.h"
 #include "printing/page_range.h"
 #include "printing/page_setup.h"
+#include "printing/print_settings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -45,6 +46,17 @@ const PageSetup kPageSetupForcedMargins(kPageSetupPhysicalSize,
                                         /*forced_margins=*/true,
                                         kPageSetupTextHeight);
 
+constexpr gfx::Size kRequestedMediaSize =
+    gfx::Size(/*width=*/25, /*height=*/75);
+const char kRequestedMediaVendorId[] = "iso-foo";
+
+PrintSettings::RequestedMedia GenerateSampleRequestedMedia() {
+  PrintSettings::RequestedMedia media;
+  media.size_microns = kRequestedMediaSize;
+  media.vendor_id = kRequestedMediaVendorId;
+  return media;
+}
+
 }  // namespace
 
 TEST(PrintingContextMojomTraitsTest, TestSerializeAndDeserializePageMargins) {
@@ -208,4 +220,30 @@ TEST(PrintingContextMojomTraitsTest,
       mojo::test::SerializeAndDeserialize<mojom::PageRange>(input, output));
 }
 
+TEST(PrintingContextMojomTraitsTest,
+     TestSerializeAndDeserializeRequestedMedia) {
+  PrintSettings::RequestedMedia input = GenerateSampleRequestedMedia();
+  PrintSettings::RequestedMedia output;
+
+  EXPECT_TRUE(mojo::test::SerializeAndDeserialize<mojom::RequestedMedia>(
+      input, output));
+
+  EXPECT_EQ(kRequestedMediaSize, output.size_microns);
+  EXPECT_EQ(kRequestedMediaVendorId, output.vendor_id);
+}
+
+TEST(PrintingContextMojomTraitsTest,
+     TestSerializeAndDeserializeRequestedMediaEmpty) {
+  PrintSettings::RequestedMedia input;
+  PrintSettings::RequestedMedia output;
+
+  // The default is empty.
+  EXPECT_TRUE(input.IsDefault());
+
+  EXPECT_TRUE(mojo::test::SerializeAndDeserialize<mojom::RequestedMedia>(
+      input, output));
+
+  EXPECT_TRUE(output.IsDefault());
+}
+
 }  // namespace printing