Updates display.mojom to include more of Display

There were a couple of values not being written. This updates the
mojom and traits appropriately.

BUG=718860
TEST=covered by tests
R=tsepez@chromium.org

Review-Url: https://codereview.chromium.org/2894763003
Cr-Commit-Position: refs/heads/master@{#473473}

ui/display/mojo/display.mojom

@@ -25,9 +25,13 @@ enum TouchSupport {
 struct Display {
   int64 id;
   gfx.mojom.Rect bounds;
+  gfx.mojom.Size size_in_pixels;
   gfx.mojom.Rect work_area;
   float device_scale_factor;
   Rotation rotation;
   TouchSupport touch_support;
   gfx.mojom.Size maximum_cursor_size;
+  int32 color_depth;
+  int32 depth_per_component;
+  bool is_monochrome;
 };

ui/display/mojo/display_struct_traits.cc

@@ -85,6 +85,9 @@ bool StructTraits<display::mojom::DisplayDataView, display::Display>::Read(
   if (!data.ReadBounds(&out->bounds_))
     return false;
 
+  if (!data.ReadSizeInPixels(&out->size_in_pixels_))
+    return false;
+
   if (!data.ReadWorkArea(&out->work_area_))
     return false;
 
@@ -99,6 +102,10 @@ bool StructTraits<display::mojom::DisplayDataView, display::Display>::Read(
   if (!data.ReadMaximumCursorSize(&out->maximum_cursor_size_))
     return false;
 
+  out->set_color_depth(data.color_depth());
+  out->set_depth_per_component(data.depth_per_component());
+  out->set_is_monochrome(data.is_monochrome());
+
   return true;
 }
 

ui/display/mojo/display_struct_traits.h

@@ -35,6 +35,10 @@ struct StructTraits<display::mojom::DisplayDataView, display::Display> {
     return display.bounds();
   }
 
+  static gfx::Size size_in_pixels(const display::Display& display) {
+    return display.GetSizeInPixel();
+  }
+
   static const gfx::Rect& work_area(const display::Display& display) {
     return display.work_area();
   }
@@ -56,6 +60,18 @@ struct StructTraits<display::mojom::DisplayDataView, display::Display> {
     return display.maximum_cursor_size();
   }
 
+  static int32_t color_depth(const display::Display& display) {
+    return display.color_depth();
+  }
+
+  static int32_t depth_per_component(const display::Display& display) {
+    return display.depth_per_component();
+  }
+
+  static bool is_monochrome(const display::Display& display) {
+    return display.is_monochrome();
+  }
+
   static bool Read(display::mojom::DisplayDataView data, display::Display* out);
 };
 

ui/display/mojo/display_struct_traits_unittest.cc

@@ -31,11 +31,15 @@ void CheckDisplaysEqual(const Display& input, const Display& output) {
   EXPECT_NE(&input, &output);  // Make sure they aren't the same object.
   EXPECT_EQ(input.id(), output.id());
   EXPECT_EQ(input.bounds(), output.bounds());
+  EXPECT_EQ(input.GetSizeInPixel(), output.GetSizeInPixel());
   EXPECT_EQ(input.work_area(), output.work_area());
   EXPECT_EQ(input.device_scale_factor(), output.device_scale_factor());
   EXPECT_EQ(input.rotation(), output.rotation());
   EXPECT_EQ(input.touch_support(), output.touch_support());
   EXPECT_EQ(input.maximum_cursor_size(), output.maximum_cursor_size());
+  EXPECT_EQ(input.color_depth(), output.color_depth());
+  EXPECT_EQ(input.depth_per_component(), output.depth_per_component());
+  EXPECT_EQ(input.is_monochrome(), output.is_monochrome());
 }
 
 void CheckDisplayLayoutsEqual(const DisplayLayout& input,
@@ -125,6 +129,9 @@ TEST(DisplayStructTraitsTest, SetAllDisplayValues) {
   input.set_rotation(Display::ROTATE_270);
   input.set_touch_support(Display::TOUCH_SUPPORT_AVAILABLE);
   input.set_maximum_cursor_size(maximum_cursor_size);
+  input.set_color_depth(input.color_depth() + 1);
+  input.set_depth_per_component(input.depth_per_component() + 1);
+  input.set_is_monochrome(!input.is_monochrome());
 
   Display output;
   SerializeAndDeserialize<mojom::Display>(input, &output);